Module Name: src
Committed By: phx
Date: Wed Jun 9 17:34:33 UTC 2010
Modified Files:
src/etc/etc.sandpoint: Makefile.inc
src/sys/arch/sandpoint/conf: GENERIC INSTALL KUROBOX
Added Files:
src/sys/arch/sandpoint/conf: INSTALL_KURO
Removed Files:
src/sys/arch/sandpoint/conf: GENERIC.NAS RAMDISK
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/etc/etc.sandpoint/Makefile.inc
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/sandpoint/conf/GENERIC
cvs rdiff -u -r1.14 -r0 src/sys/arch/sandpoint/conf/GENERIC.NAS
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sandpoint/conf/INSTALL
cvs rdiff -u -r0 -r1.1 src/sys/arch/sandpoint/conf/INSTALL_KURO
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sandpoint/conf/KUROBOX
cvs rdiff -u -r1.4 -r0 src/sys/arch/sandpoint/conf/RAMDISK
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.sandpoint/Makefile.inc
diff -u src/etc/etc.sandpoint/Makefile.inc:1.12 src/etc/etc.sandpoint/Makefile.inc:1.13
--- src/etc/etc.sandpoint/Makefile.inc:1.12 Mon May 17 22:52:17 2010
+++ src/etc/etc.sandpoint/Makefile.inc Wed Jun 9 17:34:32 2010
@@ -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
Index: src/sys/arch/sandpoint/conf/GENERIC
diff -u src/sys/arch/sandpoint/conf/GENERIC:1.47 src/sys/arch/sandpoint/conf/GENERIC:1.48
--- src/sys/arch/sandpoint/conf/GENERIC:1.47 Mon May 17 22:52:17 2010
+++ src/sys/arch/sandpoint/conf/GENERIC Wed Jun 9 17:34:32 2010
@@ -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
Index: src/sys/arch/sandpoint/conf/INSTALL
diff -u src/sys/arch/sandpoint/conf/INSTALL:1.6 src/sys/arch/sandpoint/conf/INSTALL:1.7
--- src/sys/arch/sandpoint/conf/INSTALL:1.6 Fri Feb 6 18:50:28 2009
+++ src/sys/arch/sandpoint/conf/INSTALL Wed Jun 9 17:34:32 2010
@@ -1,6 +1,6 @@
-# $NetBSD: INSTALL,v 1.6 2009/02/06 18:50:28 jym Exp $
+# $NetBSD: INSTALL,v 1.7 2010/06/09 17:34:32 phx Exp $
#
-# GENERIC for Motorola Sandpoint
+# GENERIC install kernel for SandPoint NAS
#
include "arch/sandpoint/conf/GENERIC"
Index: src/sys/arch/sandpoint/conf/KUROBOX
diff -u src/sys/arch/sandpoint/conf/KUROBOX:1.2 src/sys/arch/sandpoint/conf/KUROBOX:1.3
--- src/sys/arch/sandpoint/conf/KUROBOX:1.2 Sat May 29 22:47:02 2010
+++ src/sys/arch/sandpoint/conf/KUROBOX Wed Jun 9 17:34:32 2010
@@ -1,9 +1,9 @@
-# $NetBSD: KUROBOX,v 1.2 2010/05/29 22:47:02 phx Exp $
+# $NetBSD: KUROBOX,v 1.3 2010/06/09 17:34:32 phx Exp $
#
# KuroBox/LinkStation support
#
-include "arch/sandpoint/conf/GENERIC.NAS"
+include "arch/sandpoint/conf/GENERIC"
no com0
no satmgr0
Added files:
Index: src/sys/arch/sandpoint/conf/INSTALL_KURO
diff -u /dev/null src/sys/arch/sandpoint/conf/INSTALL_KURO:1.1
--- /dev/null Wed Jun 9 17:34:33 2010
+++ src/sys/arch/sandpoint/conf/INSTALL_KURO Wed Jun 9 17:34:32 2010
@@ -0,0 +1,13 @@
+# $NetBSD: INSTALL_KURO,v 1.1 2010/06/09 17:34:32 phx Exp $
+#
+# GENERIC install kernel for KuroBox / LinkStation
+#
+
+include "arch/sandpoint/conf/KUROBOX"
+
+options MEMORY_DISK_HOOKS
+options MEMORY_DISK_IS_ROOT # Force root on RAM disk
+options MEMORY_DISK_ROOT_SIZE=4096 # 2 MB
+options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
+
+pseudo-device md 1
