From owner-svn-src-projects@FreeBSD.ORG Mon Jan 12 19:19:52 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E51E2106564A; Mon, 12 Jan 2009 19:19:51 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D2DE88FC0A; Mon, 12 Jan 2009 19:19:51 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0CJJpY1074183; Mon, 12 Jan 2009 19:19:51 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0CJJp50074173; Mon, 12 Jan 2009 19:19:51 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901121919.n0CJJp50074173@svn.freebsd.org> From: Sam Leffler Date: Mon, 12 Jan 2009 19:19:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: 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... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jan 2009 19:19:52 -0000 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