svn commit: r187108 - in stable/7/sys: . arm/conf conf contrib/pf dev/ath/ath_hal dev/cxgb

[Sam Leffler]

Author: sam
Date: Mon Jan 12 19:16:00 2009
New Revision: 187108
URL: http://svn.freebsd.org/changeset/base/187108

Log:
  MFC r185478: enable use of modules but disable them by adding MODULES_OVERRIDE=""

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/arm/conf/AVILA
  stable/7/sys/arm/conf/BWCT
  stable/7/sys/arm/conf/CRB
  stable/7/sys/arm/conf/EP80219
  stable/7/sys/arm/conf/HL200
  stable/7/sys/arm/conf/IQ31244
  stable/7/sys/arm/conf/KB920X
  stable/7/sys/arm/conf/SIMICS
  stable/7/sys/arm/conf/SKYEYE
  stable/7/sys/conf/Makefile.arm
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/arm/conf/AVILA
==============================================================================
--- stable/7/sys/arm/conf/AVILA	Mon Jan 12 17:26:52 2009	(r187107)
+++ stable/7/sys/arm/conf/AVILA	Mon Jan 12 19:16:00 2009	(r187108)
@@ -31,6 +31,7 @@ options STARTUP_PAGETABLE_ADDR=0x1000000
 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: stable/7/sys/arm/conf/BWCT
==============================================================================
--- stable/7/sys/arm/conf/BWCT	Mon Jan 12 17:26:52 2009	(r187107)
+++ stable/7/sys/arm/conf/BWCT	Mon Jan 12 19:16:00 2009	(r187108)
@@ -28,6 +28,7 @@ include		"../at91/std.kb920x"
 #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: stable/7/sys/arm/conf/CRB
==============================================================================
--- stable/7/sys/arm/conf/CRB	Mon Jan 12 17:26:52 2009	(r187107)
+++ stable/7/sys/arm/conf/CRB	Mon Jan 12 19:16:00 2009	(r187108)
@@ -29,6 +29,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: stable/7/sys/arm/conf/EP80219
==============================================================================
--- stable/7/sys/arm/conf/EP80219	Mon Jan 12 17:26:52 2009	(r187107)
+++ stable/7/sys/arm/conf/EP80219	Mon Jan 12 19:16:00 2009	(r187108)
@@ -29,6 +29,7 @@ options 	STARTUP_PAGETABLE_ADDR=0xa00000
 include	"../xscale/i80321/std.ep80219"
 #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: stable/7/sys/arm/conf/HL200
==============================================================================
--- stable/7/sys/arm/conf/HL200	Mon Jan 12 17:26:52 2009	(r187107)
+++ stable/7/sys/arm/conf/HL200	Mon Jan 12 19:16:00 2009	(r187108)
@@ -33,6 +33,7 @@ options		KERNVIRTADDR=0xc0100000
 #To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		#Default places to look for devices.
 hints		"KB920X.hints"
+makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 options		DDB

Modified: stable/7/sys/arm/conf/IQ31244
==============================================================================
--- stable/7/sys/arm/conf/IQ31244	Mon Jan 12 17:26:52 2009	(r187107)
+++ stable/7/sys/arm/conf/IQ31244	Mon Jan 12 19:16:00 2009	(r187108)
@@ -30,6 +30,7 @@ options STARTUP_PAGETABLE_ADDR=0xa000000
 include		"../xscale/i80321/std.iq31244"
 #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: stable/7/sys/arm/conf/KB920X
==============================================================================
--- stable/7/sys/arm/conf/KB920X	Mon Jan 12 17:26:52 2009	(r187107)
+++ stable/7/sys/arm/conf/KB920X	Mon Jan 12 19:16:00 2009	(r187108)
@@ -25,6 +25,7 @@ include		"../at91/std.kb920x"
 #To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		#Default places to look for devices.
 hints		"KB920X.hints"
+makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 options		DDB

Modified: stable/7/sys/arm/conf/SIMICS
==============================================================================
--- stable/7/sys/arm/conf/SIMICS	Mon Jan 12 17:26:52 2009	(r187107)
+++ stable/7/sys/arm/conf/SIMICS	Mon Jan 12 19:16:00 2009	(r187108)
@@ -26,6 +26,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: stable/7/sys/arm/conf/SKYEYE
==============================================================================
--- stable/7/sys/arm/conf/SKYEYE	Mon Jan 12 17:26:52 2009	(r187107)
+++ stable/7/sys/arm/conf/SKYEYE	Mon Jan 12 19:16:00 2009	(r187108)
@@ -27,6 +27,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: stable/7/sys/conf/Makefile.arm
==============================================================================
--- stable/7/sys/conf/Makefile.arm	Mon Jan 12 17:26:52 2009	(r187107)
+++ stable/7/sys/conf/Makefile.arm	Mon Jan 12 19:16:00 2009	(r187108)
@@ -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)
@@ -109,6 +106,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