Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-4]: src Apply patch (requested by toddpw):
details: https://anonhg.NetBSD.org/src/rev/6a00772e2e41
branches: netbsd-1-4
changeset: 470445:6a00772e2e41
user: he <he%NetBSD.org@localhost>
date: Wed Mar 01 00:05:40 2000 +0000
description:
Apply patch (requested by toddpw):
Increase size of install kernel ramdisk, and use a more configurable
method that does not use /etc/disktab, so we won't have to change
it. Change kernel config files to know the new ramdisk size.
diffstat:
distrib/arm32/ramdisk/Makefile | 40 +++-
sys/arch/arm32/conf/A7INST | 4 +-
sys/arch/arm32/conf/CATSINST | 365 +++++++++++++++++++++++++++++++++++++++++
sys/arch/arm32/conf/RPCINST | 4 +-
sys/arch/arm32/conf/SHARKINST | 4 +-
5 files changed, 404 insertions(+), 13 deletions(-)
diffs (truncated from 498 to 300 lines):
diff -r 30aa32e940a6 -r 6a00772e2e41 distrib/arm32/ramdisk/Makefile
--- a/distrib/arm32/ramdisk/Makefile Tue Feb 29 23:52:25 2000 +0000
+++ b/distrib/arm32/ramdisk/Makefile Wed Mar 01 00:05:40 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7.2.2 1999/06/26 23:37:23 cgd Exp $
+# $NetBSD: Makefile,v 1.7.2.3 2000/03/01 00:05:40 he Exp $
TOP= ${.CURDIR}/..
@@ -11,7 +11,7 @@
CBIN= ramdiskbin
MOUNT_POINT?= /mnt
-# DEV/RDEV file system device, CDEV/RDEV vnconfig device
+# DEV/RDEV file system device, CDEV/CRDEV vnconfig device
VND?= vnd0
VND_DEV= /dev/${VND}a
VND_RDEV= /dev/r${VND}a
@@ -23,8 +23,16 @@
CRUNCHCONF= ${CBIN}.conf
MTREE= mtree.conf
+# CYLS must be a multiple of 8 on arm32 (??)
+# TOTALSECT must match options MINIROOTSIZE in the *INST kernels.
+CYLS= 80
+SECS= 15
+TRKS= 3
+TOTALSECT != expr ${CYLS} '*' ${SECS} '*' ${TRKS}
DISKTYPE= install-ramdisk
-RDSIZE= 3400
+DISKTAB= ./{DISKTYPE}.disktab
+GEOM= 512/${SECS}/${TRKS}/${CYLS}
+INO_BYTES= 5120
install.sh: install.tmpl
sed "s/@@VERSION@@/${VER}/" < ${.ALLSRC} > ${.TARGET}
@@ -36,10 +44,12 @@
sed "s/@@VERSION@@/${VER}/" < ${.ALLSRC} > ${.TARGET}
all: ${AUXTARGETS} ${CBIN}
- dd if=/dev/zero of=${IMAGE} count=${RDSIZE}
- vnconfig -t ${DISKTYPE} -v -c ${VND_CDEV} ${IMAGE}
- disklabel -rw ${VND_CRDEV} ${DISKTYPE}
- newfs -B le -m 0 -o space -i 5120 -c 100 ${VND_RDEV}
+ dd if=/dev/zero of=${IMAGE} count=${TOTALSECT}
+ vnconfig -v -c ${VND_CDEV} ${IMAGE} ${GEOM}
+ echo "${DISKTYPE}:ty=simulated:se#512:nt#${TRKS}:ns#${SECS}:nc#${CYLS}:pa#${TOTALSECT}:oa#0:ba#4096:fa#512:ta=4.2BSD:pc#${TOTALSECT}:oc#0:" > ${DISKTAB}
+ disklabel -rw -f ${DISKTAB} ${VND_CDEV} ${DISKTYPE}
+ disklabel -W ${VND_CDEV}
+ newfs -B le -m 0 -o space -i ${INO_BYTES} -c ${CYLS} ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
mtree -def ${.CURDIR}/${MTREE} -p ${MOUNT_POINT}/ -u
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
@@ -64,5 +74,21 @@
clean cleandir distclean:
/bin/rm -f ${AUXCLEAN} *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c
+.ifndef RELEASEDIR
+release:
+ @echo setenv RELEASEDIR first
+ @false
+.else
+release: $(IMAGE)
+ gzip -c -9 < $(.OBJDIR)/${IMAGE} \
+ > $(RELEASEDIR)/installation/misc/${IMAGE}.gz
+.for instkern in A7INST CATSINST RPCINST SHARKINST
+ cp ../../../sys/arch/arm32/compile/${instkern}/netbsd netbsd.tmp
+ mdsetimage -v netbsd.tmp ${IMAGE}
+ gzip -c -9 < netbsd.tmp \
+ > $(RELEASEDIR)/installation/kernel/netbsd.${instkern}.gz
+.endfor # A7INST CATSINST RPCINST SHARKINST
+.endif # RELEASEDIR check
+
.include <bsd.obj.mk>
.include <bsd.subdir.mk>
diff -r 30aa32e940a6 -r 6a00772e2e41 sys/arch/arm32/conf/A7INST
--- a/sys/arch/arm32/conf/A7INST Tue Feb 29 23:52:25 2000 +0000
+++ b/sys/arch/arm32/conf/A7INST Wed Mar 01 00:05:40 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: A7INST,v 1.22.2.1 1999/04/20 19:35:30 perry Exp $
+# $NetBSD: A7INST,v 1.22.2.2 2000/03/01 00:06:30 he Exp $
#
# A7INST - A7000 install configuration
#
@@ -96,7 +96,7 @@
options MEMORY_DISK_HOOKS # boottime setup of ramdisk
#options MEMORY_DISK_SIZE=0 # Size in blocks
-options MINIROOTSIZE=3400 # Size in blocks
+options MINIROOTSIZE=3600 # Size in blocks
options MEMORY_DISK_IS_ROOT # use memory disk as root
# Miscellaneous kernel options
diff -r 30aa32e940a6 -r 6a00772e2e41 sys/arch/arm32/conf/CATSINST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm32/conf/CATSINST Wed Mar 01 00:05:40 2000 +0000
@@ -0,0 +1,365 @@
+# $NetBSD: CATSINST,v 1.1.2.2 2000/03/01 00:06:30 he Exp $
+#
+# CATSINST -- CHALTECH CATS Install kernel
+#
+
+include "arch/arm32/conf/std.arm32"
+
+# estimated number of users
+
+maxusers 8
+
+# Standard system options
+
+options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
+#options NTP # NTP phase/frequency locked loop
+
+# CPU options
+
+# For standard RiscPC's
+#options CPU_SA110 # Support the SA110 core
+#options CPU_ARM6 # Support the ARM6 core
+#options CPU_ARM7 # Support the ARM7 core
+#options CPU_ARM8 # Support the ARM8 core
+#options ARM6_LATE_ABORT # ARM6XX late abort support
+
+# For A7000, Stork and other ARM7500 machines
+#options CPU_ARM7 # Support the ARM7 core
+#options CPU_ARM7500 # We are actually an ARM7500
+
+# For StrongARM systems
+options CPU_SA110 # Support the SA110 core
+
+# Architecture options
+#options IOMD # We have an IOMD
+#options RISCPC # We are a RiscPC
+#options RC7500 # We are a RC7500
+options FOOTBRIDGE # We have DC21285 'Footbridge' core logic
+options EBSA285 # We are an EBSA285
+
+# FPA options
+
+#options ARMFPE # ARM Ltd FPE
+
+# File systems
+
+file-system FFS # UFS
+#file-system LFS # log-structured file system
+#file-system MFS # memory file system
+file-system NFS # Network file system
+#file-system ADOSFS # AmigaDOS-compatible file system
+#file-system EXT2FS # second extended file system (linux)
+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 PORTAL # portal filesystem (still experimental)
+#file-system PROCFS # /proc
+#file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
+
+# File system options
+#options QUOTA # UFS quotas
+#options FFS_EI # FFS Endian Independant support
+#options NFSSERVER
+
+# Networking options
+
+#options GATEWAY # packet forwarding
+options INET # IP + ICMP + TCP + UDP
+#options MROUTING # IP multicast routing
+#options NS # XNS
+#options NSIP # XNS tunneling over IP
+#options ISO,TPIP # OSI
+#options EON # OSI tunneling over IP
+#options CCITT,LLC,HDLC # X.25
+#options NETATALK # AppleTalk networking
+#options PFIL_HOOKS # pfil(9) packet filter hooks
+#options PPP_BSDCOMP # BSD-Compress compression support for PPP
+#options PPP_DEFLATE # Deflate compression support for PPP
+#options PPP_FILTER # Active filter support for PPP (requires bpf)
+
+options NFS_BOOT_BOOTP
+options NFS_BOOT_DHCP
+#options NFS_BOOT_BOOTPARAM
+
+# Compatibility options
+
+#options COMPAT_43 # 4.3BSD compatibility.
+options COMPAT_13 # NetBSD 1.3 compatibility.
+#options COMPAT_12 # NetBSD 1.2 compatibility.
+#options COMPAT_11 # NetBSD 1.1 compatibility.
+#options COMPAT_10 # NetBSD 1.0 compatibility.
+#options COMPAT_09 # NetBSD 0.9 compatibility.
+#options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD
+
+# Shared memory options
+
+options SYSVMSG # System V-like message queues
+options SYSVSEM # System V-like semaphores
+options SYSVSHM # System V-like memory sharing
+options SHMMAXPGS=1024 # 1024 pages is the default
+
+# Device options
+
+options MEMORY_DISK_HOOKS # boottime setup of ramdisk
+#options MEMORY_DISK_SIZE=0 # Size in blocks
+options MINIROOTSIZE=3600 # Size in blocks
+options MEMORY_DISK_IS_ROOT # use memory disk as root
+
+# Miscellaneous kernel options
+#options KTRACE # system call tracing, a la ktrace(1)
+#options IRQSTATS # manage IRQ statistics
+#options LKM # loadable kernel modules
+#options KMEMSTATS # kernel memory statistics
+options SCSIVERBOSE # Verbose SCSI errors
+options PCIVERBOSE # Verbose PCI descriptions
+options USBVERBOSE # verbose USB device autoconfig messages
+#options DDB_KEYCODE=0x40
+options PMAP_STATIC_L1S=128
+
+# wscons options
+#options WSEMUL_SUN # sun terminal emulation
+options WSEMUL_VT100 # VT100 / VT220 emulation
+# different kernel output - see dev/wscons/wsdisplayvar.h
+options WS_KERNEL_FG=WSCOL_GREEN
+options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
+options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
+options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
+# see dev/wscons/wskbdmap_mfii.h for implemented layouts
+#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
+
+# Development and Debugging options
+
+#options ARM700BUGTRACK # track the ARM700 swi bug
+#options PORTMASTER # Enable PortMaster only options
+options DIAGNOSTIC # internally consistency checks
+#options PMAP_DEBUG # Enable pmap_debug_level code
+options POSTMORTEM # perform postmortem on panic
+#options IPKDB # remote kernel debugging
+options DDB # in-kernel debugger
+options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
+#makeoptions DEBUG="-g" # compile full symbol table
+
+config netbsd root on ? type ?
+
+# The main bus device
+mainbus0 at root
+
+# The boot cpu
+cpu0 at mainbus?
+
+# Core logic
+footbridge0 at mainbus?
+
+# footbridge uart
+fcom0 at footbridge?
+
+# system clock via footbridge
+#clock* at footbridge?
+
+# time-of-day device via footbridge or RTC
+todclock0 at todservice?
+
+# PCI bus via footbridge
+pci0 at footbridge? # PCI bus
+
+pci* at ppb? bus ?
+
+# PCI bridges
+ppb* at pci? dev ? function ? # PCI-PCI bridges
+# XXX 'puc's aren't really bridges, but there's no better place for them here
+#puc* at pci? dev ? function ? # PCI "universal" comm. cards
+
+# PCI serial interfaces
+#com* at puc? port ? # 16x450s on "universal" comm boards
+#cy* at pci? dev ? function ? # Cyclades Cyclom-Y serial boards
+
+# PCI parallel printer interfaces
+#lpt* at puc? port ? # || ports on "universal" comm boards
+
+# PCI SCSI Controllers and Buses
+#adv* at pci? dev ? function ? # AdvanSys 1200[A,B], ULTRA SCSI
+#scsibus* at adv?
+ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI controllers
+scsibus* at ahc?
+#bha* at pci? dev ? function ? # BusLogic 9xx SCSI
+#scsibus* at bha?
+isp* at pci? dev ? function ? # Qlogic ISP 10x0 SCSI controllers
+scsibus* at isp?
+#ncr* at pci? dev ? function ? # NCR 53c8xx SCSI
+#scsibus* at ncr?
+
+# SCSI devices
+sd* at scsibus? target ? lun ? # SCSI disk drives
+st* at scsibus? target ? lun ? # SCSI tape drives
+cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
+#ch* at scsibus? target ? lun ? # SCSI auto-changers
+#uk* at scsibus? target ? lun ? # SCSI unknown device
+#ss* at scsibus? target ? lun ? # SCSI scanner
+
+# PCI IDE Controllers and Devices
Home |
Main Index |
Thread Index |
Old Index