diff options
| -rw-r--r-- | distrib/sgi/cdfs/Makefile | 8 | ||||
| -rw-r--r-- | distrib/sgi/ramdisk/Makefile | 4 | ||||
| -rw-r--r-- | distrib/sgi/ramdisk/list | 7 | ||||
| -rw-r--r-- | etc/etc.sgi/disktab | 12 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/RAMDISK-IP27 | 4 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/RAMDISK-IP30 | 4 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/RAMDISK-IP32 | 4 |
7 files changed, 25 insertions, 18 deletions
diff --git a/distrib/sgi/cdfs/Makefile b/distrib/sgi/cdfs/Makefile index fb7d9e55bcf..70d37e2c127 100644 --- a/distrib/sgi/cdfs/Makefile +++ b/distrib/sgi/cdfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2009/05/30 04:01:27 miod Exp $ +# $OpenBSD: Makefile,v 1.10 2010/03/31 19:44:33 miod Exp $ TOP= ${.CURDIR}/.. @@ -7,12 +7,14 @@ TOP= ${.CURDIR}/.. BSDRD= bsd.rd CDROM= cd${REV}.iso FFS= ffs.img +# must match the size of `minicdroot' in disktab +CDFSMB= 10 all: ${CDROM} ${CDROM}: -rm -rf ${.OBJDIR}/cd-dir mkdir -p ${.OBJDIR}/cd-dir/ - dd if=/dev/zero of=${.OBJDIR}/${FFS} bs=1m count=8 + dd if=/dev/zero of=${.OBJDIR}/${FFS} bs=1m count=${CDFSMB} vnconfig -v -c svnd0 ${.OBJDIR}/${FFS} disklabel -w svnd0 minicdroot "OpenBSD/sgi " newfs /dev/rsvnd0a @@ -38,7 +40,7 @@ ${CDROM}: umount ${.OBJDIR}/cd-dir @df /dev/svnd0a vnconfig -u svnd0 - dd if=/dev/zero of=${.OBJDIR}/${CDROM} bs=1m count=10 + dd if=/dev/zero of=${.OBJDIR}/${CDROM} bs=1m count=`expr ${CDFSMB} + 2` vnconfig -v -c svnd0 ${.OBJDIR}/${CDROM} # boot32 needs 77, boot64 needs 173, and add some room for growth /usr/mdec/sgivol -i -h 320 svnd0 > ${.OBJDIR}/volhdr diff --git a/distrib/sgi/ramdisk/Makefile b/distrib/sgi/ramdisk/Makefile index 7d73cfc4c02..b137487d8b7 100644 --- a/distrib/sgi/ramdisk/Makefile +++ b/distrib/sgi/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2009/05/30 04:01:29 miod Exp $ +# $OpenBSD: Makefile,v 1.12 2010/03/31 19:44:35 miod Exp $ REV= ${OSrev} @@ -23,7 +23,7 @@ PID!= echo $$$$ DISKTYPE= rdroot -NBLKS= 8192 +NBLKS= 10240 # minfree, opt, b/i trks, sects, cpg NEWFSARGS= -m 0 -o space -i 4096 diff --git a/distrib/sgi/ramdisk/list b/distrib/sgi/ramdisk/list index daf64aa9662..5c1995db8f7 100644 --- a/distrib/sgi/ramdisk/list +++ b/distrib/sgi/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.26 2010/03/31 17:51:42 deraadt Exp $ +# $OpenBSD: list,v 1.27 2010/03/31 19:44:35 miod Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -81,6 +81,11 @@ TERMCAP vt100,vt220,dumb usr/share/misc/termcap # firmwares that might need loading #COPY ${DESTDIR}/etc/firmware/tigon1 etc/firmware/tigon1 #COPY ${DESTDIR}/etc/firmware/tigon2 etc/firmware/tigon2 +COPY ${DESTDIR}/etc/firmware/bnx-b06 etc/firmware/bnx-b06 +COPY ${DESTDIR}/etc/firmware/bnx-b09 etc/firmware/bnx-b09 +COPY ${DESTDIR}/etc/firmware/bnx-rv2p etc/firmware/bnx-rv2p +COPY ${DESTDIR}/etc/firmware/bnx-xi-rv2p etc/firmware/bnx-xi-rv2p +COPY ${DESTDIR}/etc/firmware/bnx-xi90-rv2p etc/firmware/bnx-xi90-rv2p # dhcp things SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script diff --git a/etc/etc.sgi/disktab b/etc/etc.sgi/disktab index aca27ad4dc1..d9467b77726 100644 --- a/etc/etc.sgi/disktab +++ b/etc/etc.sgi/disktab @@ -29,14 +29,14 @@ # rdroot|ramdiskroot|RAM-disk root FS image:\ - :ty=simulated:se#512:nc#16:nt#4:ns#128:\ - :ta=4.2BSD:oa#0:pa#8192:fa#512:ba#4096:\ - :ob#0:pb#0:oc#0:pc#8192: + :ty=simulated:se#512:nc#20:nt#4:ns#128:\ + :ta=4.2BSD:oa#0:pa#10240:fa#512:ba#4096:\ + :ob#0:pb#0:oc#0:pc#10240: minicdroot|minicdramdiskroot|RAM-disk root FS image:\ - :ty=simulated:se#512:nc#32:nt#4:ns#128:\ - :ta=4.2BSD:oa#0:pa#16384:fa#512:ba#4096:\ - :ob#0:pb#0:oc#0:pc#16384: + :ty=simulated:se#512:nc#40:nt#4:ns#128:\ + :ta=4.2BSD:oa#0:pa#20480:fa#512:ba#4096:\ + :ob#0:pb#0:oc#0:pc#20480: cdroot|cdramdiskroot|RAM-disk root FS image:\ :ty=simulated:se#2048:nc#16:nt#280:ns#32:\ diff --git a/sys/arch/sgi/conf/RAMDISK-IP27 b/sys/arch/sgi/conf/RAMDISK-IP27 index 161b977cc7f..edec469e31e 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP27 +++ b/sys/arch/sgi/conf/RAMDISK-IP27 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP27,v 1.19 2010/03/22 21:28:11 miod Exp $ +# $OpenBSD: RAMDISK-IP27,v 1.20 2010/03/31 19:44:35 miod Exp $ # # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY. @@ -30,7 +30,7 @@ option INET # IP + ICMP + TCP + UDP option INET6 # IPv6 (needs INET) # RAMDISK stuff -option MINIROOTSIZE=8192 +option MINIROOTSIZE=10240 option RAMDISK_HOOKS # Define what targets to support diff --git a/sys/arch/sgi/conf/RAMDISK-IP30 b/sys/arch/sgi/conf/RAMDISK-IP30 index 504891f494b..d5aa1424d7f 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP30 +++ b/sys/arch/sgi/conf/RAMDISK-IP30 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP30,v 1.16 2010/03/22 21:28:11 miod Exp $ +# $OpenBSD: RAMDISK-IP30,v 1.17 2010/03/31 19:44:35 miod Exp $ # # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY. @@ -30,7 +30,7 @@ option INET # IP + ICMP + TCP + UDP option INET6 # IPv6 (needs INET) # RAMDISK stuff -option MINIROOTSIZE=8192 +option MINIROOTSIZE=10240 option RAMDISK_HOOKS # Define what targets to support diff --git a/sys/arch/sgi/conf/RAMDISK-IP32 b/sys/arch/sgi/conf/RAMDISK-IP32 index d5cbd20be77..44c86825214 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP32 +++ b/sys/arch/sgi/conf/RAMDISK-IP32 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP32,v 1.12 2010/03/22 21:28:11 miod Exp $ +# $OpenBSD: RAMDISK-IP32,v 1.13 2010/03/31 19:44:35 miod Exp $ # # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY. @@ -30,7 +30,7 @@ option INET # IP + ICMP + TCP + UDP option INET6 # IPv6 (needs INET) # RAMDISK stuff -option MINIROOTSIZE=8192 +option MINIROOTSIZE=10240 option RAMDISK_HOOKS # Define what targets to support |