Author: ian
Date: Sun Oct 26 18:30:35 2014
New Revision: 273703
URL: https://svnweb.freebsd.org/changeset/base/273703
Log:
Remove the ARM_DEVICE_MULTIPASS option and make its effect be the default.
Multipass device attachment was tested on many arm platforms by users and
only success was reported on the arm@ mailing list. This is just the
long-delayed followup of making it the default.
Multipass attachment is necessary when using vendor-supplied FDT data,
because our devices may need to be attached in a different order than they
are described in the FDT data.
Modified:
head/sys/arm/arm/nexus.c
head/sys/arm/at91/std.atmel
head/sys/conf/options.arm
Modified: head/sys/arm/arm/nexus.c
==============================================================================
--- head/sys/arm/arm/nexus.c Sun Oct 26 17:56:58 2014 (r273702)
+++ head/sys/arm/arm/nexus.c Sun Oct 26 18:30:35 2014 (r273703)
@@ -128,12 +128,8 @@ static driver_t nexus_driver = {
nexus_methods,
1 /* no softc */
};
-#ifdef ARM_DEVICE_MULTIPASS
EARLY_DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0,
BUS_PASS_BUS + BUS_PASS_ORDER_EARLY);
-#else
-DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0);
-#endif
static int
nexus_probe(device_t dev)
Modified: head/sys/arm/at91/std.atmel
==============================================================================
--- head/sys/arm/at91/std.atmel Sun Oct 26 17:56:58 2014 (r273702)
+++ head/sys/arm/at91/std.atmel Sun Oct 26 18:30:35 2014 (r273703)
@@ -12,4 +12,3 @@ device at91sam9x5
# bring in the sam specific timers and such
device at91sam9
-options ARM_DEVICE_MULTIPASS
Modified: head/sys/conf/options.arm
==============================================================================
--- head/sys/conf/options.arm Sun Oct 26 17:56:58 2014 (r273702)
+++ head/sys/conf/options.arm Sun Oct 26 18:30:35 2014 (r273703)
@@ -1,7 +1,6 @@
#$FreeBSD$
ARM9_CACHE_WRITE_THROUGH opt_global.h
ARM_CACHE_LOCK_ENABLE opt_global.h
-ARM_DEVICE_MULTIPASS opt_global.h
ARM_KERN_DIRECTMAP opt_vm.h
ARM_L2_PIPT opt_global.h
ARM_MANY_BOARD opt_global.h
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
