summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--distrib/sparc64/miniroot/Makefile8
-rw-r--r--etc/etc.sparc64/disktab8
-rw-r--r--sys/arch/sparc64/conf/GENERIC4
-rw-r--r--sys/arch/sparc64/conf/RAMDISK4
4 files changed, 16 insertions, 8 deletions
diff --git a/distrib/sparc64/miniroot/Makefile b/distrib/sparc64/miniroot/Makefile
index c9bbe4ded48..415182b98be 100644
--- a/distrib/sparc64/miniroot/Makefile
+++ b/distrib/sparc64/miniroot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2001/10/12 21:55:59 jason Exp $
+# $OpenBSD: Makefile,v 1.2 2003/02/06 13:26:47 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -43,10 +43,14 @@ installboot:
/usr/mdec/installboot -v ${DESTDIR}/usr/mdec/bootblk /dev/svnd0c
blank_filesystem:
- dd if=/dev/zero of=${TARGET} bs=512 count=3200
+ dd if=/dev/zero of=${TARGET} bs=512 count=4096
.endif
+unconfig:
+ -umount -f /mnt
+ -vnconfig -u /dev/svnd0a
+
install:
cp ${TARGET} ${DESTDIR}/snapshot/
diff --git a/etc/etc.sparc64/disktab b/etc/etc.sparc64/disktab
index 0cb96d13cbb..dcbffb7540c 100644
--- a/etc/etc.sparc64/disktab
+++ b/etc/etc.sparc64/disktab
@@ -1,4 +1,4 @@
-# $OpenBSD: disktab,v 1.7 2002/06/09 06:15:15 todd Exp $
+# $OpenBSD: disktab,v 1.8 2003/02/06 13:26:46 deraadt Exp $
#
# @(#)disktab 5.5 (Berkeley) 2/27/91
#
@@ -45,9 +45,9 @@ fakecdrom|Fake image for Bootable CDROM:\
:pd#1310720:od#0:bd#8192:fd#1024:td=4.2BSD:
fakeramdisk:\
- :ty=winchester:se#512:nt#1:rm#350:ns#640:nc#2048:\
- :pa#3200:oa#0:ba#8192:fa#4096:ta=4.2BSD:\
- :pc#3200:oc#0:
+ :ty=winchester:se#512:nt#1:rm#350:ns#32:nc#128:\
+ :pa#4096:oa#0:ba#8192:fa#4096:ta=4.2BSD:\
+ :pc#4096:oc#0:
ASI-1.0GIBM:\
:ty#winchester:ns#80:nt#15:nc#1632:
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 2b8ee4077c8..62f844c8dc4 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.76 2002/12/04 21:33:20 jason Exp $
+# $OpenBSD: GENERIC,v 1.77 2003/02/06 13:26:44 deraadt Exp $
# $NetBSD: GENERIC32,v 1.18 2001/07/20 00:07:12 eeh Exp $
machine sparc64
@@ -44,6 +44,7 @@ dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet
# PCI SCSI
siop* at pci? dev ? function ?
isp* at pci? dev ? function ?
+option ISP_COMPILE_FW=1
scsibus* at siop?
# PCI Display
@@ -172,6 +173,7 @@ esp* at dma? flags 0x0000 # SBus
esp* at sbus? slot ? offset ?
isp* at sbus? slot ? offset ?
+option ISP_COMPILE_1000_FW=1
# SCSI bus layer. SCSI devices attach to the SCSI bus, which attaches
# to the underlying hardware controller.
diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK
index 3661aed63bd..0beceb5c20a 100644
--- a/sys/arch/sparc64/conf/RAMDISK
+++ b/sys/arch/sparc64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.19 2002/12/31 02:37:31 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.20 2003/02/06 13:26:44 deraadt Exp $
# Machine architecture; required by config(8)
machine sparc64
@@ -86,10 +86,12 @@ dma* at sbus? slot ? offset ? # SBus
esp* at dma? flags 0x0000 # SBus
esp* at sbus? slot ? offset ?
isp* at sbus? slot ? offset ?
+option ISP_COMPILE_1000_FW=1
scsibus* at esp?
siop* at pci? dev ? function ?
isp* at pci? dev ? function ?
+option ISP_COMPILE_FW=1
scsibus* at siop?
scsibus* at isp?