Move the examples for the 'hints' and 'env' keywords from various GENERIC

kernel configs into NOTES.

Reviewed by:	imp

14 files changed, 9 insertions, 62 deletions

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index b308b97..1876c64 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -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
diff --git a/sys/amd64/conf/XENHVM b/sys/amd64/conf/XENHVM
index f875f5a..4c1981c 100644
--- a/sys/amd64/conf/XENHVM
+++ b/sys/amd64/conf/XENHVM
@@ -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=""
 
diff --git a/sys/arm/conf/CRB b/sys/arm/conf/CRB
index ef0265f..f865473 100644
--- a/sys/arm/conf/CRB
+++ b/sys/arm/conf/CRB
@@ -26,8 +26,6 @@ options 	KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
 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
diff --git a/sys/arm/conf/EP80219 b/sys/arm/conf/EP80219
index 65121bc..4efc432 100644
--- a/sys/arm/conf/EP80219
+++ b/sys/arm/conf/EP80219
@@ -26,8 +26,6 @@ options 	KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
 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
diff --git a/sys/arm/conf/GUMSTIX b/sys/arm/conf/GUMSTIX
index 864a4f5..a122a5e 100644
--- a/sys/arm/conf/GUMSTIX
+++ b/sys/arm/conf/GUMSTIX
@@ -32,8 +32,6 @@ options 	KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
 
 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
diff --git a/sys/arm/conf/IQ31244 b/sys/arm/conf/IQ31244
index e8ed9e8..4621756 100644
--- a/sys/arm/conf/IQ31244
+++ b/sys/arm/conf/IQ31244
@@ -27,8 +27,6 @@ options 	LOADERRAMADDR=0x00000000
 
 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
diff --git a/sys/arm/conf/SIMICS b/sys/arm/conf/SIMICS
index e225795..d4f6c14 100644
--- a/sys/arm/conf/SIMICS
+++ b/sys/arm/conf/SIMICS
@@ -23,8 +23,6 @@ options KERNPHYSADDR=0xc0000000
 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
diff --git a/sys/arm/conf/SKYEYE b/sys/arm/conf/SKYEYE
index 56fa39c..10aedd5 100644
--- a/sys/arm/conf/SKYEYE
+++ b/sys/arm/conf/SKYEYE
@@ -24,8 +24,6 @@ options 	KERNPHYSADDR=0xc0000000
 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
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index cd38da0..ba8ac59 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -50,6 +50,15 @@ ident		LINT
 #
 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.
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 51ada7f..eebd737 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -23,15 +23,6 @@ cpu		I586_CPU
 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
diff --git a/sys/mips/conf/QEMU b/sys/mips/conf/QEMU
index 64a33ae..5042848 100644
--- a/sys/mips/conf/QEMU
+++ b/sys/mips/conf/QEMU
@@ -30,8 +30,6 @@ makeoptions	MODULES_OVERRIDE=""
 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
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 569a111..6787d87 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -23,15 +23,6 @@ cpu		I586_CPU
 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
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index efa7764..4fda8cb 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -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
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index a5d4649..87d4e85 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -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