From 0bae968c93fd0435b93e84cef7960dd2dd4f18cc Mon Sep 17 00:00:00 2001
From: rahnds <>
Date: Fri, 29 May 1998 04:22:22 +0000
Subject: [PATCH] configuration (/etc) changes causes with the changes to ofw
 support in powerpc port.

---
 src/etc/etc.powerpc/MAKEDEV      | 25 ++++++++++++++++++++++---
 src/etc/etc.powerpc/Makefile.inc | 29 +++++++++++++++++++++++++++--
 src/etc/etc.powerpc/disktab      |  8 ++++----
 src/etc/etc.powerpc/fbtab        |  1 +
 src/etc/etc.powerpc/ttys         |  3 ++-
 5 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/src/etc/etc.powerpc/MAKEDEV b/src/etc/etc.powerpc/MAKEDEV
index 0331edea..479a1c39 100644
--- a/src/etc/etc.powerpc/MAKEDEV
+++ b/src/etc/etc.powerpc/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#       $OpenBSD: MAKEDEV,v 1.15 1998/04/06 20:17:16 pefo Exp $
+#       $OpenBSD: MAKEDEV,v 1.16 1998/05/29 04:22:18 rahnds Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -83,9 +83,12 @@ case $i in
 all)
 	sh MAKEDEV std fd
 	sh MAKEDEV sd0 sd1 sd2 sd3 st0 st1 cd0 cd1
+	sh MAKEDEV ofdisk0 ofdisk1 ofdisk2 ofdisk3 ofdisk4 
+	sh MAKEDEV ofdisk5 ofdisk6 ofdisk7 ofdisk8 ofdisk9 
 	sh MAKEDEV vnd0 vnd1 vnd2 vnd3
 	sh MAKEDEV ccd0 ccd1 ccd2 ccd3
 	sh MAKEDEV rd0
+	sh MAKEDEV ttyo0
 	sh MAKEDEV tty00 tty01 pty0
 	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
 	sh MAKEDEV tun0 tun1 tun2 tun3
@@ -96,7 +99,9 @@ all)
 ramdisk)
 	sh MAKEDEV std
 	sh MAKEDEV sd0 sd1 sd2 sd3 sd4 st0 st1 cd0 cd1
+	sh MAKEDEV ofdisk0 ofdisk1 ofdisk2 ofdisk3 ofdisk4 
 	sh MAKEDEV rd0
+	sh MAKEDEV ttyo0
 	sh MAKEDEV tty00 tty01 pty0
 	;;
 
@@ -127,15 +132,16 @@ fd)
 	chmod 666 fd/*
 	;;
 
-sd*|ccd*)
+sd*|ccd*|ofdisk*)
 	umask 2 ; unit=`expr $i : '.*[^0-9]\([0-9]*\)'`
 	case $i in
 	sd*) name=sd; blk=2; chr=8;;
+	ofdisk*) name=ofdisk; blk=4; chr=13;;
 	ccd*) name=ccd; blk=16; chr=18;;
 	esac
 	rm -f $name$unit? r$name$unit?
 	case $unit in
-	0|1|2|3|4|5|6)
+	0|1|2|3|4|5|6|7|8|9)
 		mknod ${name}${unit}a	b $blk `expr $unit '*' 16 + 0`
 		mknod ${name}${unit}b	b $blk `expr $unit '*' 16 + 1`
 		mknod ${name}${unit}c	b $blk `expr $unit '*' 16 + 2`
@@ -225,6 +231,19 @@ vnd*)
 	umask 77
 	;;
 
+ttyo*)
+	unit=`expr $i : 'ttyo\(.*\)'`
+	rm -f ser${unit} tty${unit} ttyo${unit}
+	case ${unit} in
+	0|1)
+		mknod ttyo${unit} c 14 ${unit}
+		chown uucp.wheel ttyo${unit}
+		;;
+	*)
+		echo bad unit for serial tty in: $i
+		;;
+	esac
+	;;
 tty0*)
 	unit=`expr $i : 'tty0\(.*\)'`
 	rm -f ser${unit} tty${unit} tty0${unit}
diff --git a/src/etc/etc.powerpc/Makefile.inc b/src/etc/etc.powerpc/Makefile.inc
index 45f99db7..2f4c1398 100644
--- a/src/etc/etc.powerpc/Makefile.inc
+++ b/src/etc/etc.powerpc/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.5 1998/04/06 20:17:19 pefo Exp $
+#	$OpenBSD: Makefile.inc,v 1.6 1998/05/29 04:22:19 rahnds Exp $
 #	etc.powerpc/Makefile.inc -- powerpc-specific etc Makefile targets
 
 .ifdef DESTDIR
@@ -14,9 +14,34 @@ bsd:
 	    make clean && make depend && make
 	cp ${.CURDIR}/../sys/arch/powerpc/compile/GENERIC/bsd \
 	    ${DESTDIR}/snapshot/bsd
+	cd ${.CURDIR}/../sys/arch/powerpc/conf && config DDBOFW
+	cd ${.CURDIR}/../sys/arch/powerpc/compile/DDBOFW && \
+	    make clean && make depend && make
+	cp ${.CURDIR}/../sys/arch/powerpc/compile/DDBOFW/bsd \
+	    ${DESTDIR}/snapshot/bsdofw
 
+# knows about bsdofw.rd and bsd.rd
 distrib:
 	cd ${.CURDIR}/../distrib && make cleandir && \
-	    make && make install
+		make && make install
+	mkdir ${DESTDIR}/snapshot/boot
+	cp ${DESTDIR}/snapshot/bsd.rd ${DESTDIR}/snapshot/boot/bsd.rd
+	strip ${DESTDIR}/snapshot/boot/bsd.rd
+	gzip -9 ${DESTDIR}/snapshot/boot/bsd.rd
+	mv ${DESTDIR}/snapshot/boot/bsd.rd.gz ${DESTDIR}/snapshot/boot/bsd
+	cp ${DESTDIR}/usr/mdec/ofwboot ${DESTDIR}/snapshot/boot
+	mkisofs -r ${DESTDIR}/snapshot/boot > ${DESTDIR}/snapshot/boot.fs
+	rm -rf ${DESTDIR}/snapshot/boot
+	#
+	mkdir ${DESTDIR}/snapshot/bootofw
+	cp ${DESTDIR}/snapshot/bsdofw.rd ${DESTDIR}/snapshot/bootofw/bsdofw.rd
+	strip ${DESTDIR}/snapshot/bootofw/bsdofw.rd
+	gzip -9 ${DESTDIR}/snapshot/bootofw/bsdofw.rd
+	mv ${DESTDIR}/snapshot/bootofw/bsdofw.rd.gz ${DESTDIR}/snapshot/bootofw/bsd
+	cp ${DESTDIR}/usr/mdec/ofwboot ${DESTDIR}/snapshot/bootofw
+	cp ${DESTDIR}/usr/mdec/boot.mac ${DESTDIR}/snapshot/bootofw
+	mkisofs -r ${DESTDIR}/snapshot/bootofw > ${DESTDIR}/snapshot/bootofw.fs
+	rm -rf ${DESTDIR}/snapshot/bootofw
+
 
 .endif	# DESTDIR check
diff --git a/src/etc/etc.powerpc/disktab b/src/etc/etc.powerpc/disktab
index cef05cf3..15228ff0 100644
--- a/src/etc/etc.powerpc/disktab
+++ b/src/etc/etc.powerpc/disktab
@@ -1,4 +1,4 @@
-# $Id: disktab,v 1.3 1997/05/01 09:33:08 deraadt Exp $
+# $Id: disktab,v 1.4 1998/05/29 04:22:20 rahnds Exp $
 #
 #	@(#)disktab	5.5 (Berkeley) 2/27/91
 #
@@ -20,9 +20,9 @@
 
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#16:nt#2:ns#128:\
-	:ta=4.2BSD:oa#0:pa#4096:fa#512:ba#4096:\
-	:ob#0:pb#0:oc#0:pc#4096:
+	:ty=simulated:se#512:nc#16:nt#2:ns#256:\
+	:ta=4.2BSD:oa#0:pa#8192:fa#512:ba#4096:\
+	:ob#0:pb#0:oc#0:pc#8192:
 
 # pseudo-geometry taken from rd7945
 miniroot:\
diff --git a/src/etc/etc.powerpc/fbtab b/src/etc/etc.powerpc/fbtab
index 82cc8e0e..c9192764 100644
--- a/src/etc/etc.powerpc/fbtab
+++ b/src/etc/etc.powerpc/fbtab
@@ -1,2 +1,3 @@
 /dev/ttya	0600	/dev/console
 /dev/tty00	0600	/dev/console
+/dev/ttyo0	0600	/dev/console
diff --git a/src/etc/etc.powerpc/ttys b/src/etc/etc.powerpc/ttys
index 204b33da..1e5397b8 100644
--- a/src/etc/etc.powerpc/ttys
+++ b/src/etc/etc.powerpc/ttys
@@ -1,8 +1,9 @@
 #
-#	$OpenBSD: ttys,v 1.4 1997/10/15 14:09:34 pefo Exp $
+#	$OpenBSD: ttys,v 1.5 1998/05/29 04:22:22 rahnds Exp $
 #
 # name	getty				type	status		comments
 #
 console	"/usr/libexec/getty std.9600"	unknown	off secure
 tty00	"/usr/libexec/getty std.9600"	unknown	on  secure
 tty01	"/usr/libexec/getty std.9600"	unknown	off secure
+ttyo0	"/usr/libexec/getty std.9600"	unknown	on  secure