From owner-freebsd-arch@FreeBSD.ORG Thu Jan 14 15:30:13 2010 Return-Path: Delivered-To: arch@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A75A1065672 for ; Thu, 14 Jan 2010 15:30:13 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 457028FC12 for ; Thu, 14 Jan 2010 15:30:13 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id EB37B46B0D for ; Thu, 14 Jan 2010 10:30:12 -0500 (EST) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPA id C6B528A01D for ; Thu, 14 Jan 2010 10:30:11 -0500 (EST) From: John Baldwin To: arch@freebsd.org Date: Thu, 14 Jan 2010 10:30:11 -0500 User-Agent: KMail/1.12.1 (FreeBSD/7.2-CBSD-20091231; KDE/4.3.1; amd64; ; ) MIME-Version: 1.0 Content-Type: Text/Plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Message-Id: <201001141030.11301.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Thu, 14 Jan 2010 10:30:12 -0500 (EST) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.6 required=4.2 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: Subject: Removing example 'hints' and 'env' directives from GENERIC X-BeenThere: freebsd-arch@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussion related to FreeBSD architecture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jan 2010 15:30:13 -0000 This just moves the commented out examples of using GENERIC.hints or GENERIC.env to sys/conf/NOTES and out of various kernel config files. After these changes there is one other commented out 'hints' line in the tree: > grep '#hints' */conf/* arm/conf/BWCT:#hints "hints.at91rm9200" I am leaving it for now, but that file doesn't exist in the tree currently. Index: conf/NOTES =================================================================== --- conf/NOTES (revision 202187) +++ conf/NOTES (working copy) @@ -50,7 +50,16 @@ # maxusers 10 +# To statically compile in device wiring instead of /boot/device.hints +#hints "LINT.hints" # Default places to look for devices. + +# Use the following to compile in values accessible to the kernel +# through getenv() (or kenv(1) in userland). The format of the file +# is 'variable=value', see kenv(1) # +#env "LINT.env" + +# # The `makeoptions' parameter allows variables to be passed to the # generated Makefile in the build area. # Index: amd64/conf/XENHVM =================================================================== --- amd64/conf/XENHVM (revision 202286) +++ amd64/conf/XENHVM (working copy) @@ -21,15 +21,6 @@ cpu HAMMER ident XENHVM -# To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" # Default places to look for devices. - -# Use the following to compile in values accessible to the kernel -# through getenv() (or kenv(1) in userland). The format of the file -# is 'variable=value', see kenv(1) -# -# env "GENERIC.env" - makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols makeoptions MODULES_OVERRIDE="" Index: amd64/conf/GENERIC =================================================================== --- amd64/conf/GENERIC (revision 202187) +++ amd64/conf/GENERIC (working copy) @@ -21,15 +21,6 @@ cpu HAMMER ident GENERIC -# To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" # Default places to look for devices. - -# Use the following to compile in values accessible to the kernel -# through getenv() (or kenv(1) in userland). The format of the file -# is 'variable=value', see kenv(1) -# -# env "GENERIC.env" - makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols options SCHED_ULE # ULE scheduler Index: arm/conf/SIMICS =================================================================== --- arm/conf/SIMICS (revision 202187) +++ arm/conf/SIMICS (working copy) @@ -23,8 +23,6 @@ options KERNVIRTADDR=0xc0000000 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 Index: arm/conf/GUMSTIX =================================================================== --- arm/conf/GUMSTIX (revision 202187) +++ arm/conf/GUMSTIX (working copy) @@ -32,8 +32,6 @@ options STARTUP_PAGETABLE_ADDR=0xa0000000 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 Index: arm/conf/CRB =================================================================== --- arm/conf/CRB (revision 202187) +++ arm/conf/CRB (working copy) @@ -26,8 +26,6 @@ options COUNTS_PER_SEC=400000000 options STARTUP_PAGETABLE_ADDR=0x00000000 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 Index: arm/conf/IQ31244 =================================================================== --- arm/conf/IQ31244 (revision 202187) +++ arm/conf/IQ31244 (working copy) @@ -27,8 +27,6 @@ options STARTUP_PAGETABLE_ADDR=0xa0000000 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 Index: arm/conf/EP80219 =================================================================== --- arm/conf/EP80219 (revision 202187) +++ arm/conf/EP80219 (working copy) @@ -26,8 +26,6 @@ options STARTUP_PAGETABLE_ADDR=0xa0000000 #options ARM32_NEW_VM_LAYOUT 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 Index: arm/conf/SKYEYE =================================================================== --- arm/conf/SKYEYE (revision 202187) +++ arm/conf/SKYEYE (working copy) @@ -24,8 +24,6 @@ options KERNVIRTADDR=0xc0000000 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 Index: i386/conf/GENERIC =================================================================== --- i386/conf/GENERIC (revision 202187) +++ i386/conf/GENERIC (working copy) @@ -23,15 +23,6 @@ cpu I686_CPU ident GENERIC -# To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" # Default places to look for devices. - -# Use the following to compile in values accessible to the kernel -# through getenv() (or kenv(1) in userland). The format of the file -# is 'variable=value', see kenv(1) -# -# env "GENERIC.env" - makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols options SCHED_ULE # ULE scheduler Index: mips/conf/QEMU =================================================================== --- mips/conf/QEMU (revision 202187) +++ mips/conf/QEMU (working copy) @@ -30,8 +30,6 @@ options KERNVIRTADDR=0x80100000 include "../adm5120/std.adm5120" -#hints "GENERIC.hints" #Default places to look for devices. - makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options DDB Index: pc98/conf/GENERIC =================================================================== --- pc98/conf/GENERIC (revision 202187) +++ pc98/conf/GENERIC (working copy) @@ -23,15 +23,6 @@ cpu I686_CPU ident GENERIC -# To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" # Default places to look for devices. - -# Use the following to compile in values accessible to the kernel -# through getenv() (or kenv(1) in userland). The format of the file -# is 'variable=value', see kenv(1) -# -# env "GENERIC.env" - makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols options SCHED_4BSD # 4BSD scheduler Index: powerpc/conf/GENERIC =================================================================== --- powerpc/conf/GENERIC (revision 202187) +++ powerpc/conf/GENERIC (working copy) @@ -21,9 +21,6 @@ cpu AIM ident GENERIC -#To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" - makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols # Platform support Index: sparc64/conf/GENERIC =================================================================== --- sparc64/conf/GENERIC (revision 202187) +++ sparc64/conf/GENERIC (working copy) @@ -21,15 +21,6 @@ cpu SUN4U ident GENERIC -# To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" # Default places to look for devices. - -# Use the following to compile in values accessible to the kernel -# through getenv() (or kenv(1) in userland). The format of the file -# is 'variable=value', see kenv(1) -# -# env "GENERIC.env" - makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols # Platforms supported -- John Baldwin