Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/broadcom acpi glue is conditional on acpinodebus



details:   https://anonhg.NetBSD.org/src/rev/fb61e520ff63
branches:  trunk
changeset: 967993:fb61e520ff63
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Dec 31 00:59:26 2019 +0000

description:
acpi glue is conditional on acpinodebus

diffstat:

 sys/arch/arm/broadcom/files.bcm2835 |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (32 lines):

diff -r 097440a1a425 -r fb61e520ff63 sys/arch/arm/broadcom/files.bcm2835
--- a/sys/arch/arm/broadcom/files.bcm2835       Mon Dec 30 23:32:29 2019 +0000
+++ b/sys/arch/arm/broadcom/files.bcm2835       Tue Dec 31 00:59:26 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.bcm2835,v 1.37 2019/12/30 18:53:34 jmcneill Exp $
+#      $NetBSD: files.bcm2835,v 1.38 2019/12/31 00:59:26 jmcneill Exp $
 #
 # Configuration info for Broadcom BCM2835 ARM Peripherals
 #
@@ -19,8 +19,11 @@
 file   arch/arm/broadcom/bcm2835_mbox.c        bcmmbox
 attach bcmmbox at fdt with bcmmbox_fdt
 file    arch/arm/broadcom/bcm2835_mbox_fdt.c   bcmmbox_fdt
+
+ifdef acpinodebus
 attach  bcmmbox at acpinodebus with bcmmbox_acpi
 file   arch/arm/broadcom/bcm2835_mbox_acpi.c   bcmmbox_acpi
+endif
 
 # System Timer (BCM2835_TIMER_BASE)
 device bcmtmr
@@ -56,8 +59,10 @@
 attach sdhc at fdt with bcmemmc
 file   arch/arm/broadcom/bcm2835_emmc.c        bcmemmc
 
+ifdef acpinodebus
 attach sdhc at acpinodebus with bcmemmc_acpi
 file   arch/arm/broadcom/bcm2835_emmc_acpi.c   bcmemmc_acpi
+endif
 
 # SD Host Controller (BCM2835_SDHOST_BASE)
 device bcmsdhost: sdmmcbus



Home | Main Index | Thread Index | Old Index