svn commit: r185478 - in head/sys: arm/conf conf

[Sam Leffler]

Author: sam
Date: Sun Nov 30 17:53:19 2008
New Revision: 185478
URL: http://svn.freebsd.org/changeset/base/185478

Log:
  enable use of modules but disable them by adding MODULES_OVERRIDE=""
  in each config file until we can sort out issues in the modules tree
  
  Reviewed by:	imp
  MFC after:	1 month

Modified:
  head/sys/arm/conf/AVILA
  head/sys/arm/conf/BWCT
  head/sys/arm/conf/CRB
  head/sys/arm/conf/DB-78XXX
  head/sys/arm/conf/DB-88F5XXX
  head/sys/arm/conf/DB-88F6XXX
  head/sys/arm/conf/GUMSTIX
  head/sys/arm/conf/KB920X
  head/sys/arm/conf/NSLU
  head/sys/arm/conf/SIMICS
  head/sys/arm/conf/SKYEYE
  head/sys/conf/Makefile.arm

Modified: head/sys/arm/conf/AVILA
==============================================================================
--- head/sys/arm/conf/AVILA	Sun Nov 30 17:40:05 2008	(r185477)
+++ head/sys/arm/conf/AVILA	Sun Nov 30 17:53:19 2008	(r185478)
@@ -30,6 +30,7 @@ options 	STARTUP_PAGETABLE_ADDR=0x100000
 include		"../xscale/ixp425/std.avila"
 #To statically compile in device wiring instead of /boot/device.hints
 hints		"AVILA.hints"		#Default places to look for devices.
+makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	CONF_CFLAGS=-mcpu=xscale

Modified: head/sys/arm/conf/BWCT
==============================================================================
--- head/sys/arm/conf/BWCT	Sun Nov 30 17:40:05 2008	(r185477)
+++ head/sys/arm/conf/BWCT	Sun Nov 30 17:53:19 2008	(r185478)
@@ -27,6 +27,7 @@ include		"../at91/std.bwct"
 #To statically compile in device wiring instead of /boot/device.hints
 #hints		"hints.at91rm9200"
 hints		"BWCT.hints"
+makeoptions	MODULES_OVERRIDE=""
 
 #makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 options		DDB

Modified: head/sys/arm/conf/CRB
==============================================================================
--- head/sys/arm/conf/CRB	Sun Nov 30 17:40:05 2008	(r185477)
+++ head/sys/arm/conf/CRB	Sun Nov 30 17:53:19 2008	(r185478)
@@ -28,6 +28,7 @@ options STARTUP_PAGETABLE_ADDR=0x0000000
 include		"../xscale/i8134x/std.crb"
 #To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		#Default places to look for devices.
+makeoptions	MODULES_OVERRIDE=""
 
 #makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	CONF_CFLAGS=-mcpu=xscale

Modified: head/sys/arm/conf/DB-78XXX
==============================================================================
--- head/sys/arm/conf/DB-78XXX	Sun Nov 30 17:40:05 2008	(r185477)
+++ head/sys/arm/conf/DB-78XXX	Sun Nov 30 17:53:19 2008	(r185478)
@@ -8,6 +8,7 @@ ident		DB-88F78XX
 include		"../mv/discovery/std.db78xxx"
 
 options		SOC_MV_DISCOVERY
+makeoptions	MODULES_OVERRIDE=""
 
 #makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	WERROR="-Werror"

Modified: head/sys/arm/conf/DB-88F5XXX
==============================================================================
--- head/sys/arm/conf/DB-88F5XXX	Sun Nov 30 17:40:05 2008	(r185477)
+++ head/sys/arm/conf/DB-88F5XXX	Sun Nov 30 17:53:19 2008	(r185478)
@@ -8,6 +8,7 @@ ident		DB-88F5XXX
 include		"../mv/orion/std.db88f5xxx"
 
 options		SOC_MV_ORION
+makeoptions	MODULES_OVERRIDE=""
 
 #makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	WERROR="-Werror"

Modified: head/sys/arm/conf/DB-88F6XXX
==============================================================================
--- head/sys/arm/conf/DB-88F6XXX	Sun Nov 30 17:40:05 2008	(r185477)
+++ head/sys/arm/conf/DB-88F6XXX	Sun Nov 30 17:53:19 2008	(r185478)
@@ -8,6 +8,7 @@ ident		DB-88F6XXX
 include		"../mv/kirkwood/std.db88f6xxx"
 
 options		SOC_MV_KIRKWOOD
+makeoptions	MODULES_OVERRIDE=""
 
 #makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	WERROR="-Werror"

Modified: head/sys/arm/conf/GUMSTIX
==============================================================================
--- head/sys/arm/conf/GUMSTIX	Sun Nov 30 17:40:05 2008	(r185477)
+++ head/sys/arm/conf/GUMSTIX	Sun Nov 30 17:53:19 2008	(r185478)
@@ -34,6 +34,7 @@ options		STARTUP_PAGETABLE_ADDR=0xa00000
 include		"../xscale/pxa/std.pxa"
 #To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		#Default places to look for devices.
+makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 options		HZ=100

Modified: head/sys/arm/conf/KB920X
==============================================================================
--- head/sys/arm/conf/KB920X	Sun Nov 30 17:40:05 2008	(r185477)
+++ head/sys/arm/conf/KB920X	Sun Nov 30 17:53:19 2008	(r185478)
@@ -24,6 +24,7 @@ include		"../at91/std.kb920x"
 # The AT91 platform doesn't use /boot/loader, so we have to statically wire
 # hints.
 hints		"KB920X.hints"
+makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 options 	DDB

Modified: head/sys/arm/conf/NSLU
==============================================================================
--- head/sys/arm/conf/NSLU	Sun Nov 30 17:40:05 2008	(r185477)
+++ head/sys/arm/conf/NSLU	Sun Nov 30 17:53:19 2008	(r185478)
@@ -29,6 +29,7 @@ options 	STARTUP_PAGETABLE_ADDR=0x100000
 include		"../xscale/ixp425/std.avila"
 #To statically compile in device wiring instead of /boot/device.hints
 hints		"NSLU.hints"		#Default places to look for devices.
+makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	CONF_CFLAGS=-mcpu=xscale

Modified: head/sys/arm/conf/SIMICS
==============================================================================
--- head/sys/arm/conf/SIMICS	Sun Nov 30 17:40:05 2008	(r185477)
+++ head/sys/arm/conf/SIMICS	Sun Nov 30 17:53:19 2008	(r185478)
@@ -25,6 +25,7 @@ options PHYSADDR=0xc0000000
 include		"../sa11x0/std.sa11x0"
 #To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		#Default places to look for devices.
+makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	CONF_CFLAGS=-mcpu=strongarm

Modified: head/sys/arm/conf/SKYEYE
==============================================================================
--- head/sys/arm/conf/SKYEYE	Sun Nov 30 17:40:05 2008	(r185477)
+++ head/sys/arm/conf/SKYEYE	Sun Nov 30 17:53:19 2008	(r185478)
@@ -26,6 +26,7 @@ options		PHYSADDR=0xc0000000
 include		"../at91/std.kb920x"
 #To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		#Default places to look for devices.
+makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	CONF_CFLAGS=-mcpu=arm9

Modified: head/sys/conf/Makefile.arm
==============================================================================
--- head/sys/conf/Makefile.arm	Sun Nov 30 17:40:05 2008	(r185477)
+++ head/sys/conf/Makefile.arm	Sun Nov 30 17:53:19 2008	(r185478)
@@ -19,9 +19,6 @@
 # Which version of config(8) is required.
 %VERSREQ=	600004
 
-# Temporary stuff while we're still embryonic
-NO_MODULES=
-
 STD8X16FONT?=	iso
 
 .if !defined(S)
@@ -122,6 +119,8 @@ ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$
 	rm ${KERNEL_KO}.tmp.gz ${KERNEL_KO}.tramp.noheader opt_kernname.h \
 	inflate-tramp.o tmphack.S
 
+MKMODULESENV+=	MACHINE=${MACHINE}
+
 %BEFORE_DEPEND
 
 %OBJS