svn commit: r187111 - in projects/vap7/sys: . arm/conf conf
contrib/pf dev dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210
dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212
dev/ath/ath_hal/ar5312 dev/at...
Sam Leffler
sam at FreeBSD.org
Mon Jan 12 11:19:52 PST 2009
Author: sam
Date: Mon Jan 12 19:19:51 2009
New Revision: 187111
URL: http://svn.freebsd.org/changeset/base/187111
Log:
merge r187108
Modified:
projects/vap7/sys/ (props changed)
projects/vap7/sys/arm/conf/AVILA
projects/vap7/sys/arm/conf/BWCT
projects/vap7/sys/arm/conf/CRB
projects/vap7/sys/arm/conf/EP80219
projects/vap7/sys/arm/conf/HL200
projects/vap7/sys/arm/conf/IQ31244
projects/vap7/sys/arm/conf/KB920X
projects/vap7/sys/arm/conf/SIMICS
projects/vap7/sys/arm/conf/SKYEYE
projects/vap7/sys/conf/Makefile.arm
projects/vap7/sys/contrib/pf/ (props changed)
projects/vap7/sys/dev/ (props changed)
projects/vap7/sys/dev/ath/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ar5210/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ar5211/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ar5212/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ar5312/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ar5416/ (props changed)
projects/vap7/sys/dev/cxgb/ (props changed)
projects/vap7/sys/net80211/ (props changed)
Modified: projects/vap7/sys/arm/conf/AVILA
==============================================================================
--- projects/vap7/sys/arm/conf/AVILA Mon Jan 12 19:17:43 2009 (r187110)
+++ projects/vap7/sys/arm/conf/AVILA Mon Jan 12 19:19:51 2009 (r187111)
@@ -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: projects/vap7/sys/arm/conf/BWCT
==============================================================================
--- projects/vap7/sys/arm/conf/BWCT Mon Jan 12 19:17:43 2009 (r187110)
+++ projects/vap7/sys/arm/conf/BWCT Mon Jan 12 19:19:51 2009 (r187111)
@@ -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: projects/vap7/sys/arm/conf/CRB
==============================================================================
--- projects/vap7/sys/arm/conf/CRB Mon Jan 12 19:17:43 2009 (r187110)
+++ projects/vap7/sys/arm/conf/CRB Mon Jan 12 19:19:51 2009 (r187111)
@@ -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: projects/vap7/sys/arm/conf/EP80219
==============================================================================
--- projects/vap7/sys/arm/conf/EP80219 Mon Jan 12 19:17:43 2009 (r187110)
+++ projects/vap7/sys/arm/conf/EP80219 Mon Jan 12 19:19:51 2009 (r187111)
@@ -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: projects/vap7/sys/arm/conf/HL200
==============================================================================
--- projects/vap7/sys/arm/conf/HL200 Mon Jan 12 19:17:43 2009 (r187110)
+++ projects/vap7/sys/arm/conf/HL200 Mon Jan 12 19:19:51 2009 (r187111)
@@ -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: projects/vap7/sys/arm/conf/IQ31244
==============================================================================
--- projects/vap7/sys/arm/conf/IQ31244 Mon Jan 12 19:17:43 2009 (r187110)
+++ projects/vap7/sys/arm/conf/IQ31244 Mon Jan 12 19:19:51 2009 (r187111)
@@ -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: projects/vap7/sys/arm/conf/KB920X
==============================================================================
--- projects/vap7/sys/arm/conf/KB920X Mon Jan 12 19:17:43 2009 (r187110)
+++ projects/vap7/sys/arm/conf/KB920X Mon Jan 12 19:19:51 2009 (r187111)
@@ -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: projects/vap7/sys/arm/conf/SIMICS
==============================================================================
--- projects/vap7/sys/arm/conf/SIMICS Mon Jan 12 19:17:43 2009 (r187110)
+++ projects/vap7/sys/arm/conf/SIMICS Mon Jan 12 19:19:51 2009 (r187111)
@@ -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: projects/vap7/sys/arm/conf/SKYEYE
==============================================================================
--- projects/vap7/sys/arm/conf/SKYEYE Mon Jan 12 19:17:43 2009 (r187110)
+++ projects/vap7/sys/arm/conf/SKYEYE Mon Jan 12 19:19:51 2009 (r187111)
@@ -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: projects/vap7/sys/conf/Makefile.arm
==============================================================================
--- projects/vap7/sys/conf/Makefile.arm Mon Jan 12 19:17:43 2009 (r187110)
+++ projects/vap7/sys/conf/Makefile.arm Mon Jan 12 19:19:51 2009 (r187111)
@@ -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
More information about the svn-src-projects
mailing list