From b3caab66ad59fe0eaa80703e4664422d391c439c Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Tue, 30 Apr 2013 18:33:29 +0000 Subject: [PATCH] MFP4 changes 222065 and 222068: Add a simplebus attachment for cfi(4)'s FDT support and move cfi_bus_fdt.c to sys/conf/files so non-ppc architectures are supported. Sponsored by: DARPA, AFRL --- sys/conf/files | 1 + sys/conf/files.powerpc | 1 - sys/dev/cfi/cfi_bus_fdt.c | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/conf/files b/sys/conf/files index 6972375ecdf..b5cf4d8adb4 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1046,6 +1046,7 @@ dev/cardbus/cardbus.c optional cardbus dev/cardbus/cardbus_cis.c optional cardbus dev/cardbus/cardbus_device.c optional cardbus dev/cas/if_cas.c optional cas +dev/cfi/cfi_bus_fdt.c optional cfi fdt dev/cfi/cfi_bus_nexus.c optional cfi dev/cfi/cfi_core.c optional cfi dev/cfi/cfi_dev.c optional cfi diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index b875f6bdf6e..6ab02a86e93 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -27,7 +27,6 @@ dev/adb/adb_hb_if.m optional adb dev/adb/adb_if.m optional adb dev/adb/adb_buttons.c optional adb dev/agp/agp_apple.c optional agp powermac -dev/cfi/cfi_bus_fdt.c optional cfi fdt dev/fb/fb.c optional sc dev/fdt/fdt_powerpc.c optional fdt dev/hwpmc/hwpmc_powerpc.c optional hwpmc diff --git a/sys/dev/cfi/cfi_bus_fdt.c b/sys/dev/cfi/cfi_bus_fdt.c index f775e0582c3..4a4f9052cfa 100644 --- a/sys/dev/cfi/cfi_bus_fdt.c +++ b/sys/dev/cfi/cfi_bus_fdt.c @@ -61,6 +61,7 @@ static driver_t cfi_fdt_driver = { }; DRIVER_MODULE (cfi, lbc, cfi_fdt_driver, cfi_devclass, 0, 0); +DRIVER_MODULE (cfi, simplebus, cfi_fdt_driver, cfi_devclass, 0, 0); static int cfi_fdt_probe(device_t dev)