svn commit: r250114 - in head/sys: conf dev/cfi

[Brooks Davis]

Author: brooks
Date: Tue Apr 30 18:33:29 2013
New Revision: 250114
URL: http://svnweb.freebsd.org/changeset/base/250114

Log:
  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

Modified:
  head/sys/conf/files
  head/sys/conf/files.powerpc
  head/sys/dev/cfi/cfi_bus_fdt.c

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Tue Apr 30 18:29:05 2013	(r250113)
+++ head/sys/conf/files	Tue Apr 30 18:33:29 2013	(r250114)
@@ -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

Modified: head/sys/conf/files.powerpc
==============================================================================
--- head/sys/conf/files.powerpc	Tue Apr 30 18:29:05 2013	(r250113)
+++ head/sys/conf/files.powerpc	Tue Apr 30 18:33:29 2013	(r250114)
@@ -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

Modified: head/sys/dev/cfi/cfi_bus_fdt.c
==============================================================================
--- head/sys/dev/cfi/cfi_bus_fdt.c	Tue Apr 30 18:29:05 2013	(r250113)
+++ head/sys/dev/cfi/cfi_bus_fdt.c	Tue Apr 30 18:33:29 2013	(r250114)
@@ -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)