MFC r273703:

Remove the ARM_DEVICE_MULTIPASS option and make its effect be the default.
2014-11-08 03:42:19 +00:00 · 2014-11-08 03:42:19 +00:00 · ccec47a8b5
commit ccec47a8b5
parent 8677516401
3 changed files with 1 additions and 5 deletions
--- a/sys/arm/arm/nexus.c
+++ b/sys/arm/arm/nexus.c
@ -125,12 +125,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)
--- a/sys/arm/at91/std.atmel
+++ b/sys/arm/at91/std.atmel
@ -11,3 +11,4 @@ device		at91sam9x5

 # bring in the sam specific timers and such
 device		at91sam9
+
--- a/sys/conf/options.arm
+++ b/sys/conf/options.arm
@ -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