Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src The sandpoint port is now focussed on 824x based NAS boxes.
details: https://anonhg.NetBSD.org/src/rev/c3dd53547876
branches: trunk
changeset: 755566:c3dd53547876
user: phx <phx%NetBSD.org@localhost>
date: Wed Jun 09 17:34:32 2010 +0000
description:
The sandpoint port is now focussed on 824x based NAS boxes.
Replaced GENERIC by GENERIC.NAS.
Added INSTALL_KURO for KuroBox.
GENERIC.NAS and RAMDISK are no longer needed.
diffstat:
etc/etc.sandpoint/Makefile.inc | 6 +-
sys/arch/sandpoint/conf/GENERIC | 66 ++-------
sys/arch/sandpoint/conf/GENERIC.NAS | 227 -----------------------------------
sys/arch/sandpoint/conf/INSTALL | 4 +-
sys/arch/sandpoint/conf/INSTALL_KURO | 13 ++
sys/arch/sandpoint/conf/KUROBOX | 4 +-
sys/arch/sandpoint/conf/RAMDISK | 13 --
7 files changed, 35 insertions(+), 298 deletions(-)
diffs (truncated from 476 to 300 lines):
diff -r c1ff90a5e9c8 -r c3dd53547876 etc/etc.sandpoint/Makefile.inc
--- a/etc/etc.sandpoint/Makefile.inc Wed Jun 09 17:29:15 2010 +0000
+++ b/etc/etc.sandpoint/Makefile.inc Wed Jun 09 17:34:32 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2010/05/17 22:52:17 phx Exp $
+# $NetBSD: Makefile.inc,v 1.13 2010/06/09 17:34:32 phx Exp $
#
# etc.sandpoint/Makefile.inc -- sandpoint-specific etc Makefile targets
#
@@ -6,7 +6,7 @@
# If you change the list of distributed kernels, don't forget
# to update the release documentation in distrib/notes/common/contents
-KERNEL_SETS= GENERIC GENERIC.NAS KUROBOX
+KERNEL_SETS= GENERIC KUROBOX
KERNEL_SUFFIXES= srec
-BUILD_KERNELS= INSTALL
+BUILD_KERNELS= INSTALL INSTALL_KURO
diff -r c1ff90a5e9c8 -r c3dd53547876 sys/arch/sandpoint/conf/GENERIC
--- a/sys/arch/sandpoint/conf/GENERIC Wed Jun 09 17:29:15 2010 +0000
+++ b/sys/arch/sandpoint/conf/GENERIC Wed Jun 09 17:34:32 2010 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: GENERIC,v 1.47 2010/05/17 22:52:17 phx Exp $
+# $NetBSD: GENERIC,v 1.48 2010/06/09 17:34:32 phx Exp $
#
-# GENERIC machine description file
+# machine description file for GENERIC NAS
#
# This machine description file is used to generate the default NetBSD
# kernel. The generic kernel does not include all options, subsystems
@@ -19,15 +19,14 @@
# device.
include "arch/sandpoint/conf/std.sandpoint"
-options PIC_I8259
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.47 $"
+#ident "GENERIC-$Revision: 1.48 $"
maxusers 32
-options ALTIVEC # Include AltiVec support
+#options ALTIVEC # Include AltiVec support
#options IPKDBUSERHACK # Allow access to mapped memory via kgdb
#options DEBUG_BY_TOOLS # Allow debugging from toolsnet
@@ -72,6 +71,8 @@
options MSGBUFSIZE=65536
+#options WAPBL
+
file-system FFS # UFS
file-system EXT2FS # second extended file system (linux)
#file-system LFS # log-structured file system
@@ -79,12 +80,12 @@
file-system NFS # Network File System client
#file-system NTFS # Windows/NT file system (experimental)
#file-system CD9660 # ISO 9660 + Rock Ridge file system
-#file-system MSDOSFS # MS-DOS file system
+file-system MSDOSFS # MS-DOS file system
file-system FDESC # /dev/fd
file-system KERNFS # /kern
file-system NULLFS # loopback file system
#file-system OVERLAY # overlay file system
-#file-system PROCFS # /proc
+file-system PROCFS # /proc
#file-system UMAPFS # NULLFS + uid and gid remapping
#file-system UNION # union file system
#file-system CODA # Coda File System; also needs vcoda (below)
@@ -130,14 +131,6 @@
#pseudo-device ipfilter
pseudo-device loop
-# mouse & keyboard multiplexor pseudo-devices
-#pseudo-device wsmux
-
-#
-# accept filters
-pseudo-device accf_data # "dataready" accept filter
-pseudo-device accf_http # "httpready" accept filter
-
# miscellaneous pseudo-devices
pseudo-device rnd # /dev/random and in-kernel generator
pseudo-device vnd
@@ -154,9 +147,9 @@
#
options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
-options PCIVERBOSE # verbose PCI device messages
+#options PCIVERBOSE # verbose PCI device messages
#options PCI_CONFIG_DUMP # verbosely dump PCI config space
-options PCI_NETBSD_CONFIGURE # Have NetBSD configure PCI I/O & Mem
+#options PCI_NETBSD_CONFIGURE # Have NetBSD configure PCI I/O & Mem
mainbus0 at root
@@ -164,21 +157,16 @@
pci* at mainbus0 bus ?
pchb* at pci? dev ? function ? # PCI host bridge
-pcib* at pci? dev ? function ? # Winbond 83C553 PCI-ISA bridges
eumb* at mainbus0
-com* at eumb?
+com0 at eumb? unit 0 # console at 0x4500
+#com1 at eumb? unit 1
+satmgr0 at eumb? unit 1 # satmgr at 0x4600
ociic* at eumb?
iic* at ociic?
-
-isa* at pcib? # ISA on PCI-ISA bridge
-
-mcclock0 at isa? port 0x70 # time-of-day clock
+rs5c372rtc* at iic? addr 0x32
# PCI IDE controllers - see pciide(4) for supported hardware.
-#pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver
-slide* at pci? dev ? function ? # 83C533 IDE controllers
-viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers
cmdide* at pci? dev ? function ? # CMD tech IDE controllers
iteide* at pci? dev ? function ? # IT Express IDE controllers
satalink* at pci? dev ? function ? # SiI SATALink controllers
@@ -189,15 +177,13 @@
# IDE drives
wd* at atabus? drive ? flags 0x0000 # the drives themselves
-#vga* at pci? dev ? function ?
-
# PCI network interfaces
-fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
tlp* at pci? dev ? function ? # DEC Tulip and similar
re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S
skc* at pci? dev ? function ? # Marvell Yukon Gigabit Ethernet
sk* at skc? # Marvell Yukon Gigabit Ethernet
wm* at pci? dev ? function ? # Intel 8254x gigabit
+fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
inphy* at mii? phy ? # Intel 82555 PHYs
nsphy* at mii? phy ? # NS83840 PHYs
@@ -208,12 +194,10 @@
# USB Controller and Devices
ehci* at pci? dev ? function ? # Enhanced Host Controller
ohci* at pci? dev ? function ? # Open Host Controller
-uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
# USB bus support
usb* at ehci?
usb* at ohci?
-usb* at uhci?
# USB Hubs
uhub* at usb?
@@ -223,27 +207,7 @@
umass* at uhub? port ? configuration ? interface ?
wd* at umass?
-pckbc0 at isa? # PS/2 keyboard controller
-pckbd* at pckbc? # PC keyboard
-pms* at pckbc? # PS/2 mouse for wsmouse
-#wsdisplay* at vga? console ?
-wskbd* at pckbd? console ?
-wsmouse* at pms? mux 0
-
-attimer0 at isa?
-pcppi0 at isa?
-midi* at pcppi? # MIDI interface to the PC speaker
-#sysbeep0 at pcppi?
-
-com0 at isa? port 0x3f8 irq 4 # standard PC serial ports
-com1 at isa? port 0x2f8 irq 3
-
-#lpt0 at isa? port 0x278 irq 7 # standard PC parallel ports
-#fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers
-#fd* at fdc? drive ? # the drives themselves
-
scsibus* at umass?
-
sd* at scsibus? target ? lun ? # SCSI disk drives
# Veriexec
diff -r c1ff90a5e9c8 -r c3dd53547876 sys/arch/sandpoint/conf/GENERIC.NAS
--- a/sys/arch/sandpoint/conf/GENERIC.NAS Wed Jun 09 17:29:15 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,227 +0,0 @@
-# $NetBSD: GENERIC.NAS,v 1.14 2010/05/29 22:47:02 phx Exp $
-#
-# machine description file for GENERIC.NAS
-#
-# This machine description file is used to generate the default NetBSD
-# kernel. The generic kernel does not include all options, subsystems
-# and device drivers, but should be useful for most applications.
-#
-# The machine description file can be customised for your specific
-# machine to reduce the kernel size and improve its performance.
-#
-# For further information on compiling NetBSD kernels, see the config(8)
-# man page.
-#
-# For further information on hardware support for this architecture, see
-# the intro(4) man page. For further information about kernel options
-# for this architecture, see the options(4) man page. For an explanation
-# of each device driver in this file see the section 4 man page for the
-# device.
-
-include "arch/sandpoint/conf/std.sandpoint"
-
-options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-
-#ident "GENERIC.NAS-$Revision: 1.14 $"
-
-maxusers 32
-
-#options ALTIVEC # Include AltiVec support
-
-#options IPKDBUSERHACK # Allow access to mapped memory via kgdb
-#options DEBUG_BY_TOOLS # Allow debugging from toolsnet
-# HMAC key to be used for debugging sessions
-#options IPKDBKEY="\"HMAC pass phrase text\""
-#options IPKDBSECURE # Allow debugging even when securelevel > 0
-#makeoptions DEBUG="-g"
-
-#options DEBUG
-options DIAGNOSTIC
-options TRAP_PANICWAIT
-options DDB
-#options DDB_HISTORY_SIZE=100 # Enable history editing in 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
-
-# Compatibility options
-options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI
-options COMPAT_09 # NetBSD 0.9
-options COMPAT_10 # NetBSD 1.0
-options COMPAT_11 # NetBSD 1.1
-options COMPAT_12 # NetBSD 1.2, 386BSD, and BSDI
-options COMPAT_13 # NetBSD 1.3, 386BSD, and BSDI
-options COMPAT_14 # NetBSD 1.4
-options COMPAT_15 # NetBSD 1.5
-options COMPAT_16 # NetBSD 1.6
-options COMPAT_20 # NetBSD 2.0
-options COMPAT_30 # NetBSD 3.0
-options COMPAT_40 # NetBSD 4.0
-options COMPAT_50 # NetBSD 5.0 compatibility.
-options COMPAT_43 # 4.3BSD, 386BSD, and BSDI
-#options COMPAT_386BSD_MBRPART # recognize old partition ID
-#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
-
-options COMPAT_LINUX # binary compatibility with Linux
-options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
-
-options MSGBUFSIZE=65536
-
-#options WAPBL
-
-file-system FFS # UFS
-file-system EXT2FS # second extended file system (linux)
-#file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-#file-system NTFS # Windows/NT file system (experimental)
-#file-system CD9660 # ISO 9660 + Rock Ridge file system
-#file-system MSDOSFS # MS-DOS file system
-file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-file-system NULLFS # loopback file system
-#file-system OVERLAY # overlay file system
-#file-system PROCFS # /proc
-#file-system UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
-#file-system CODA # Coda File System; also needs vcoda (below)
-#file-system SMBFS # experimental - CIFS; also needs nsmb (below)
-file-system PTYFS # /dev/ptm support
-file-system TMPFS # Efficient memory file-system
-
-# File system options
-options QUOTA # UFS quotas
-#options FFS_EI # FFS Endian Independent support
-options WAPBL # File system journaling support - Experimental
-options NFSSERVER # Network File System server
-#options FFS_NO_SNAPSHOT # No FFS snapshot support
-#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
-
-options INET
-options INET6 # IPV6
-#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
-
-#options ALTQ # Manipulate network interfaces' output queues
-#options ALTQ_BLUE # Stochastic Fair Blue
-#options ALTQ_CBQ # Class-Based Queueing
-#options ALTQ_CDNR # Diffserv Traffic Conditioner
-#options ALTQ_FIFOQ # First-In First-Out Queue
Home |
Main Index |
Thread Index |
Old Index