From owner-svn-src-all@FreeBSD.ORG Thu Oct 23 01:51:56 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 91E2D1065683; Thu, 23 Oct 2008 01:51:56 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7F1048FC19; Thu, 23 Oct 2008 01:51:56 +0000 (UTC) (envelope-from marcel@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 m9N1pu6e044635; Thu, 23 Oct 2008 01:51:56 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9N1ptUe044619; Thu, 23 Oct 2008 01:51:55 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <200810230151.m9N1ptUe044619@svn.freebsd.org> From: Marcel Moolenaar Date: Thu, 23 Oct 2008 01:51:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184193 - in head/sys: arm/conf conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Oct 2008 01:51:56 -0000 Author: marcel Date: Thu Oct 23 01:51:55 2008 New Revision: 184193 URL: http://svn.freebsd.org/changeset/base/184193 Log: Add arm/conf/DEFAULTS and populate it with: machine arm device mem options GEOM_BSD options GEOM_MBR Remove the first two from all kernel configuration files and change geom_bsd and geom_mbr from standard to optional. Added: head/sys/arm/conf/DEFAULTS (contents, props changed) 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/EP80219 head/sys/arm/conf/GUMSTIX head/sys/arm/conf/HL200 head/sys/arm/conf/IQ31244 head/sys/arm/conf/KB920X head/sys/arm/conf/NSLU head/sys/arm/conf/SIMICS head/sys/arm/conf/SKYEYE head/sys/conf/files.arm Modified: head/sys/arm/conf/AVILA ============================================================================== --- head/sys/arm/conf/AVILA Thu Oct 23 01:27:15 2008 (r184192) +++ head/sys/arm/conf/AVILA Thu Oct 23 01:51:55 2008 (r184193) @@ -18,7 +18,6 @@ # # $FreeBSD$ -machine arm ident AVILA options PHYSADDR=0x10000000 @@ -80,7 +79,6 @@ options BOOTP_COMPAT #options PREEMPTION #options VERBOSE_SYSINIT -device mem # Memory and kernel memory devices #device saarm device pci Modified: head/sys/arm/conf/BWCT ============================================================================== --- head/sys/arm/conf/BWCT Thu Oct 23 01:27:15 2008 (r184192) +++ head/sys/arm/conf/BWCT Thu Oct 23 01:51:55 2008 (r184193) @@ -17,7 +17,6 @@ # # $FreeBSD$ -machine arm ident BWCT options VERBOSE_INIT_ARM @@ -85,7 +84,6 @@ device rlswitch #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed #options DIAGNOSTIC -device mem # Memory and kernel memory devices device md device at91_twi # TWI: Two Wire Interface device at91_spi # SPI: Modified: head/sys/arm/conf/CRB ============================================================================== --- head/sys/arm/conf/CRB Thu Oct 23 01:27:15 2008 (r184192) +++ head/sys/arm/conf/CRB Thu Oct 23 01:51:55 2008 (r184193) @@ -17,7 +17,6 @@ # # $FreeBSD$ -machine arm ident CRB options PHYSADDR=0x00000000 @@ -67,7 +66,6 @@ options BOOTP_COMPAT #options PREEMPTION device loop device ether -device mem # Memory and kernel memory devices #device saarm device miibus device rl Modified: head/sys/arm/conf/DB-78XXX ============================================================================== --- head/sys/arm/conf/DB-78XXX Thu Oct 23 01:27:15 2008 (r184192) +++ head/sys/arm/conf/DB-78XXX Thu Oct 23 01:51:55 2008 (r184193) @@ -4,7 +4,6 @@ # $FreeBSD$ # -machine arm ident DB-88F78XX include "../mv/discovery/std.db78xxx" @@ -49,7 +48,6 @@ options WITNESS_SKIPSPIN #Don't run wit # Pseudo devices device loop -device mem device md device pty device random Modified: head/sys/arm/conf/DB-88F5XXX ============================================================================== --- head/sys/arm/conf/DB-88F5XXX Thu Oct 23 01:27:15 2008 (r184192) +++ head/sys/arm/conf/DB-88F5XXX Thu Oct 23 01:51:55 2008 (r184193) @@ -4,7 +4,6 @@ # $FreeBSD$ # -machine arm ident DB-88F5XXX include "../mv/orion/std.db88f5xxx" @@ -48,7 +47,6 @@ options WITNESS_SKIPSPIN #Don't run wit #options WITNESS_KDB # Pseudo devices -device mem device md device loop device pty Modified: head/sys/arm/conf/DB-88F6XXX ============================================================================== --- head/sys/arm/conf/DB-88F6XXX Thu Oct 23 01:27:15 2008 (r184192) +++ head/sys/arm/conf/DB-88F6XXX Thu Oct 23 01:51:55 2008 (r184193) @@ -4,7 +4,6 @@ # $FreeBSD$ # -machine arm ident DB-88F6XXX include "../mv/kirkwood/std.db88f6xxx" @@ -49,7 +48,6 @@ options WITNESS_SKIPSPIN #Don't run wit # Pseudo devices device loop -device mem device md device pty device random Added: head/sys/arm/conf/DEFAULTS ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/conf/DEFAULTS Thu Oct 23 01:51:55 2008 (r184193) @@ -0,0 +1,11 @@ +# +# DEFAULTS -- Default kernel configuration file for FreeBSD/arm +# +# $FreeBSD$ + +machine arm + +device mem + +options GEOM_BSD +options GEOM_MBR Modified: head/sys/arm/conf/EP80219 ============================================================================== --- head/sys/arm/conf/EP80219 Thu Oct 23 01:27:15 2008 (r184192) +++ head/sys/arm/conf/EP80219 Thu Oct 23 01:51:55 2008 (r184193) @@ -17,7 +17,6 @@ # # $FreeBSD$ -machine arm ident EP80219 options PHYSADDR=0xa0000000 @@ -69,7 +68,6 @@ options BOOTP_COMPAT #options PREEMPTION device loop device ether -device mem # Memory and kernel memory devices #device saarm device miibus device fxp Modified: head/sys/arm/conf/GUMSTIX ============================================================================== --- head/sys/arm/conf/GUMSTIX Thu Oct 23 01:27:15 2008 (r184192) +++ head/sys/arm/conf/GUMSTIX Thu Oct 23 01:51:55 2008 (r184193) @@ -18,7 +18,6 @@ # # $FreeBSD$ -machine arm ident GUMSTIX cpu CPU_XSCALE_PXA2X0 @@ -71,7 +70,6 @@ options BOOTP_BLOCKSIZE=4096 options PREEMPTION device loop device ether -device mem # Memory and kernel memory devices device mii device smc device smcphy Modified: head/sys/arm/conf/HL200 ============================================================================== --- head/sys/arm/conf/HL200 Thu Oct 23 01:27:15 2008 (r184192) +++ head/sys/arm/conf/HL200 Thu Oct 23 01:51:55 2008 (r184193) @@ -18,7 +18,6 @@ # # $FreeBSD$ -machine arm ident HL200 include "../at91/std.at91" @@ -89,7 +88,6 @@ device lxtphy #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -device mem # Memory and kernel memory devices device md device at91_twi # TWI: Two Wire Interface device at91_spi # SPI: Modified: head/sys/arm/conf/IQ31244 ============================================================================== --- head/sys/arm/conf/IQ31244 Thu Oct 23 01:27:15 2008 (r184192) +++ head/sys/arm/conf/IQ31244 Thu Oct 23 01:51:55 2008 (r184193) @@ -17,7 +17,6 @@ # # $FreeBSD$ -machine arm ident IQ31244 options PHYSADDR=0xa0000000 @@ -66,7 +65,6 @@ options BOOTP_COMPAT #options PREEMPTION device loop device ether -device mem # Memory and kernel memory devices #device saarm device miibus device rl Modified: head/sys/arm/conf/KB920X ============================================================================== --- head/sys/arm/conf/KB920X Thu Oct 23 01:27:15 2008 (r184192) +++ head/sys/arm/conf/KB920X Thu Oct 23 01:51:55 2008 (r184193) @@ -18,7 +18,6 @@ # # $FreeBSD$ -machine arm ident KB920X include "../at91/std.kb920x" @@ -80,7 +79,6 @@ device lxtphy #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -device mem # Memory and kernel memory devices device md device at91_twi # TWI: Two Wire Interface device at91_spi # SPI: Modified: head/sys/arm/conf/NSLU ============================================================================== --- head/sys/arm/conf/NSLU Thu Oct 23 01:27:15 2008 (r184192) +++ head/sys/arm/conf/NSLU Thu Oct 23 01:51:55 2008 (r184193) @@ -17,7 +17,6 @@ # # $FreeBSD$ -machine arm ident NSLU options PHYSADDR=0x10000000 @@ -76,7 +75,6 @@ options BOOTP_NFSV3 options BOOTP_WIRED_TO=npe0 options BOOTP_COMPAT -device mem # Memory and kernel memory devices device pci device uart Modified: head/sys/arm/conf/SIMICS ============================================================================== --- head/sys/arm/conf/SIMICS Thu Oct 23 01:27:15 2008 (r184192) +++ head/sys/arm/conf/SIMICS Thu Oct 23 01:51:55 2008 (r184193) @@ -17,7 +17,6 @@ # # $FreeBSD$ -machine arm ident SIMICS options KERNPHYSADDR=0xc0000000 @@ -68,5 +67,4 @@ device uart #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -device mem # Memory and kernel memory devices device md Modified: head/sys/arm/conf/SKYEYE ============================================================================== --- head/sys/arm/conf/SKYEYE Thu Oct 23 01:27:15 2008 (r184192) +++ head/sys/arm/conf/SKYEYE Thu Oct 23 01:51:55 2008 (r184193) @@ -18,7 +18,6 @@ # # $FreeBSD$ -machine arm ident KB920X options KERNPHYSADDR=0xc0000000 @@ -79,7 +78,6 @@ device uart #options SMP # Symmetric MultiProcessor Kernel #options APIC_IO # Symmetric (APIC) I/O -device mem # Memory and kernel memory devices device md options SKYEYE_WORKAROUNDS # Floppy drives Modified: head/sys/conf/files.arm ============================================================================== --- head/sys/conf/files.arm Thu Oct 23 01:27:15 2008 (r184192) +++ head/sys/conf/files.arm Thu Oct 23 01:51:55 2008 (r184193) @@ -46,10 +46,10 @@ arm/arm/vm_machdep.c standard arm/fpe-arm/armfpe_glue.S optional armfpe arm/fpe-arm/armfpe_init.c optional armfpe arm/fpe-arm/armfpe.S optional armfpe -geom/geom_bsd.c standard -geom/geom_bsd_enc.c standard -geom/geom_mbr.c standard -geom/geom_mbr_enc.c standard +geom/geom_bsd.c optional geom_bsd +geom/geom_bsd_enc.c optional geom_bsd +geom/geom_mbr.c optional geom_mbr +geom/geom_mbr_enc.c optional geom_mbr hal.o optional ath_hal \ compile-with "ATH_HAL_CPU=`echo ${CONF_CFLAGS}|sed 's/.*-mcpu=\([a-zA-Z0-9]*\).*/\1/'`; ATH_ENDIAN=`if (echo ${CC}|grep mbig-endian>/dev/null); then echo be; else echo le; fi;`; uudecode < $S/contrib/dev/ath/public/$$ATH_HAL_CPU-$$ATH_ENDIAN-elf.hal.o.uu" \ no-implicit-rule