Module Name:    src
Committed By:   nisimura
Date:           Wed Feb 22 12:36:14 UTC 2012

Modified Files:
        src/sys/arch/sandpoint/conf: ENCPP1 GENERIC SANDPOINT

Log Message:
- nuke commented-out SYMTAB_SPACE directive since this port has a
  companion bootloader which is capable of loading a plain ELF kernel
  and accompanying ELF symbol table.
- remove fxp(4) from GENERIC as no known NAS has the device.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sandpoint/conf/ENCPP1
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/sandpoint/conf/GENERIC
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sandpoint/conf/SANDPOINT

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sandpoint/conf/ENCPP1
diff -u src/sys/arch/sandpoint/conf/ENCPP1:1.9 src/sys/arch/sandpoint/conf/ENCPP1:1.10
--- src/sys/arch/sandpoint/conf/ENCPP1:1.9	Tue Nov 22 21:25:34 2011
+++ src/sys/arch/sandpoint/conf/ENCPP1	Wed Feb 22 12:36:14 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ENCPP1,v 1.9 2011/11/22 21:25:34 tls Exp $
+# $NetBSD: ENCPP1,v 1.10 2012/02/22 12:36:14 nisimura Exp $
 #
 # Ampro EnCorePP1 machine description file
 # 
@@ -23,7 +23,7 @@ options 	PIC_I8259
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"ENCPP1-$Revision: 1.9 $"
+#ident 		"ENCPP1-$Revision: 1.10 $"
 
 maxusers	32
 
@@ -42,7 +42,6 @@ options 	DDB
 options 	KTRACE
 #options 	PMAPCHECK
 #options 	PMAPDEBUG
-#options 	SYMTAB_SPACE=300000
 #options 	USERCONF	# userconf(4) support
 #options	PIPE_SOCKETPAIR		# smaller, but slower pipe(2)
 options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel

Index: src/sys/arch/sandpoint/conf/GENERIC
diff -u src/sys/arch/sandpoint/conf/GENERIC:1.70 src/sys/arch/sandpoint/conf/GENERIC:1.71
--- src/sys/arch/sandpoint/conf/GENERIC:1.70	Sat Feb 11 12:31:47 2012
+++ src/sys/arch/sandpoint/conf/GENERIC	Wed Feb 22 12:36:14 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.70 2012/02/11 12:31:47 phx Exp $
+# $NetBSD: GENERIC,v 1.71 2012/02/22 12:36:14 nisimura Exp $
 #
 # machine description file for GENERIC NAS
 # 
@@ -22,7 +22,7 @@ include 	"arch/sandpoint/conf/std.sandpo
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.70 $"
+#ident 		"GENERIC-$Revision: 1.71 $"
 
 maxusers	32
 
@@ -58,7 +58,6 @@ options 	DDB
 #options 	TRAP_PANICWAIT
 #options 	PMAPCHECK
 #options 	PMAPDEBUG
-#options 	SYMTAB_SPACE=300000
 options 	MSGBUFSIZE=65536
 
 #makeoptions	DEBUG="-g"
@@ -214,7 +213,6 @@ atabus* at ata?
 wd*		at atabus? drive ? flags 0x0000	# the drives themselves
 
 # PCI network interfaces
-fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
 ral*	at pci? dev ? function ?	# Ralink Technology RT25x0 802.11a/b/g
 re*	at pci? dev ? function ?	# Realtek 8139C+/8169/8169S/8110S
 skc*	at pci? dev ? function ?	# Marvell Yukon Gigabit Ethernet

Index: src/sys/arch/sandpoint/conf/SANDPOINT
diff -u src/sys/arch/sandpoint/conf/SANDPOINT:1.8 src/sys/arch/sandpoint/conf/SANDPOINT:1.9
--- src/sys/arch/sandpoint/conf/SANDPOINT:1.8	Tue Nov 22 21:25:34 2011
+++ src/sys/arch/sandpoint/conf/SANDPOINT	Wed Feb 22 12:36:14 2012
@@ -1,4 +1,4 @@
-# $NetBSD: SANDPOINT,v 1.8 2011/11/22 21:25:34 tls Exp $
+# $NetBSD: SANDPOINT,v 1.9 2012/02/22 12:36:14 nisimura Exp $
 #
 # Sandpoint X3/X2 machine description file
 # 
@@ -23,7 +23,7 @@ options 	PIC_I8259
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"SANDPOINT-$Revision: 1.8 $"
+#ident 		"SANDPOINT-$Revision: 1.9 $"
 
 maxusers	32
 
@@ -44,7 +44,6 @@ options 	DDB
 options 	KTRACE
 #options 	PMAPCHECK
 #options 	PMAPDEBUG
-#options 	SYMTAB_SPACE=300000
 #options 	USERCONF	# userconf(4) support
 #options	PIPE_SOCKETPAIR		# smaller, but slower pipe(2)
 options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel

Reply via email to