aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2013-04-30 18:33:29 +0000
committerBrooks Davis <brooks@FreeBSD.org>2013-04-30 18:33:29 +0000
commitb3caab66ad59fe0eaa80703e4664422d391c439c (patch)
treeaee0fc30b52709c5928526bbd2811982e626d6c6 /sys
parentd8f45cbfe8e7b8dd523889cb825c0e787923d4b4 (diff)
downloadsrc-b3caab66ad59fe0eaa80703e4664422d391c439c.tar.gz
src-b3caab66ad59fe0eaa80703e4664422d391c439c.zip
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
Notes
Notes: svn path=/head/; revision=250114
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/files1
-rw-r--r--sys/conf/files.powerpc1
-rw-r--r--sys/dev/cfi/cfi_bus_fdt.c1
3 files changed, 2 insertions, 1 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 6972375ecdf1..b5cf4d8adb40 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 b875f6bdf6e0..6ab02a86e93d 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 f775e0582c3e..4a4f9052cfa0 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)