Enable FFS2 in sgi bootblocks and ramdisks.

Tested with boot64 on IP30. State of boot32 and bootecoff is unknown.

OK otto@, deraadt@

9 files changed, 18 insertions, 11 deletions

diff --git a/sys/arch/sgi/conf/RAMDISK-IP22 b/sys/arch/sgi/conf/RAMDISK-IP22
index 2931df3fca0..69abb6f6589 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP22
+++ b/sys/arch/sgi/conf/RAMDISK-IP22
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK-IP22,v 1.16 2019/09/04 14:29:42 cheloha Exp $
+#	$OpenBSD: RAMDISK-IP22,v 1.17 2020/04/06 02:10:33 visa Exp $
 #
 # THIS KERNEL IS FOR INDIGO (IP20), INDY (IP22) AND INDIGO2 (IP24) SYSTEMS ONLY.
 
@@ -16,6 +16,7 @@ option		EISAVERBOSE
 option		PCIVERBOSE
 
 option		FFS
+option		FFS2
 option		CD9660
 option		NFSCLIENT
 option		INET6
diff --git a/sys/arch/sgi/conf/RAMDISK-IP26 b/sys/arch/sgi/conf/RAMDISK-IP26
index 0f7ac98b61c..265c7606854 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP26
+++ b/sys/arch/sgi/conf/RAMDISK-IP26
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK-IP26,v 1.5 2019/09/04 14:29:42 cheloha Exp $
+#	$OpenBSD: RAMDISK-IP26,v 1.6 2020/04/06 02:10:33 visa Exp $
 #
 # THIS KERNEL IS FOR POWER INDIGO2 R8000 (IP26) SYSTEMS ONLY.
 
@@ -16,6 +16,7 @@ option		EISAVERBOSE
 option		PCIVERBOSE
 
 option		FFS
+option		FFS2
 option		CD9660
 option		NFSCLIENT
 option		INET6
diff --git a/sys/arch/sgi/conf/RAMDISK-IP27 b/sys/arch/sgi/conf/RAMDISK-IP27
index 52acfd64c54..fde03982c2e 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP27
+++ b/sys/arch/sgi/conf/RAMDISK-IP27
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK-IP27,v 1.40 2019/09/04 14:29:42 cheloha Exp $
+#	$OpenBSD: RAMDISK-IP27,v 1.41 2020/04/06 02:10:33 visa Exp $
 #
 # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY.
 
@@ -17,6 +17,7 @@ option		USBVERBOSE
 option		ONEWIREVERBOSE
 
 option		FFS
+option		FFS2
 option		CD9660
 option		NFSCLIENT
 option		INET6
diff --git a/sys/arch/sgi/conf/RAMDISK-IP28 b/sys/arch/sgi/conf/RAMDISK-IP28
index b78dc18ca5e..e07ea14fbe7 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP28
+++ b/sys/arch/sgi/conf/RAMDISK-IP28
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK-IP28,v 1.7 2019/09/04 14:29:42 cheloha Exp $
+#	$OpenBSD: RAMDISK-IP28,v 1.8 2020/04/06 02:10:33 visa Exp $
 #
 # THIS KERNEL IS FOR POWER INDIGO2 R10000 (IP28) SYSTEMS ONLY.
 
@@ -16,6 +16,7 @@ option		PCIVERBOSE
 option		EISAVERBOSE
 
 option		FFS
+option		FFS2
 option		CD9660
 option		NFSCLIENT
 option		INET6
diff --git a/sys/arch/sgi/conf/RAMDISK-IP30 b/sys/arch/sgi/conf/RAMDISK-IP30
index 16dd44c96a6..a251d53eb64 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP30
+++ b/sys/arch/sgi/conf/RAMDISK-IP30
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK-IP30,v 1.35 2019/09/04 14:29:42 cheloha Exp $
+#	$OpenBSD: RAMDISK-IP30,v 1.36 2020/04/06 02:10:33 visa Exp $
 #
 # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY.
 
@@ -17,6 +17,7 @@ option		USBVERBOSE
 option		ONEWIREVERBOSE
 
 option		FFS
+option		FFS2
 option		CD9660
 option		NFSCLIENT
 option		INET6
diff --git a/sys/arch/sgi/stand/boot/conf.c b/sys/arch/sgi/stand/boot/conf.c
index 97312c9ad6b..d174fde8749 100644
--- a/sys/arch/sgi/stand/boot/conf.c
+++ b/sys/arch/sgi/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.6 2019/10/28 04:11:31 deraadt Exp $ */
+/*	$OpenBSD: conf.c,v 1.7 2020/04/06 02:10:33 visa Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -27,7 +27,7 @@
  */
 #include <stand.h>
 
-const char version[] = "1.10";
+const char version[] = "1.11";
 
 extern void	nullsys();
 extern int	nodev();
diff --git a/sys/arch/sgi/stand/boot/filesystem.c b/sys/arch/sgi/stand/boot/filesystem.c
index c8c6efcffad..ac3619c4f03 100644
--- a/sys/arch/sgi/stand/boot/filesystem.c
+++ b/sys/arch/sgi/stand/boot/filesystem.c
@@ -35,11 +35,13 @@
 
 #include <stand.h>
 #include <ufs.h>
+#include <ufs2.h>
 #include "netfs.h"
  
 struct fs_ops file_system[] = {
 	{ netfs_open, netfs_close, netfs_read, netfs_write, netfs_seek, netfs_stat },
 	{ ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, ufs_stat },
+	{ ufs2_open, ufs2_close, ufs2_read, ufs2_write, ufs2_seek, ufs2_stat },
 };
  
 int nfsys = sizeof(file_system)/sizeof(struct fs_ops);
diff --git a/sys/arch/sgi/stand/boot32/Makefile b/sys/arch/sgi/stand/boot32/Makefile
index e7e007441af..e319a1ed942 100644
--- a/sys/arch/sgi/stand/boot32/Makefile
+++ b/sys/arch/sgi/stand/boot32/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2011/07/09 10:44:09 miod Exp $
+#	$OpenBSD: Makefile,v 1.3 2020/04/06 02:10:33 visa Exp $
 
 .include "${.CURDIR}/../Makefile32.inc"
 LDSCRIPT=	${.CURDIR}/ld.script
@@ -7,7 +7,7 @@ PROG=		boot32
 .PATH:	${.CURDIR}/../boot
 .include "${.CURDIR}/../boot/Makefile"
 
-SRCS+=	ashrdi3.c moddi3.c udivdi3.c umoddi3.c qdivrem.c
+SRCS+=	ashrdi3.c divdi3.c moddi3.c udivdi3.c umoddi3.c qdivrem.c
 
 ${PROG}: $(OBJS) $(LDADD)
 	$(LD) $(LDFLAGS) -o ${PROG} $(OBJS) -L${LIBSADIR} ${LIBSA} \
diff --git a/sys/arch/sgi/stand/libsa/Makefile b/sys/arch/sgi/stand/libsa/Makefile
index 7e07baeab99..f70804acea8 100644
--- a/sys/arch/sgi/stand/libsa/Makefile
+++ b/sys/arch/sgi/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 2019/08/03 15:22:21 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.13 2020/04/06 02:10:33 visa Exp $
 
 LIB=	sa
 
@@ -25,7 +25,7 @@ SRCS+=	close.c closeall.c dev.c disklabel.c dkcksum.c fchmod.c \
 	fstat.c ioctl.c lseek.c open.c read.c stat.c write.c cread.c
 
 # boot filesystems
-SRCS+=	ufs.c nfs.c cd9660.c
+SRCS+=	ufs.c ufs2.c nfs.c cd9660.c
 
 ${OBJS}:	${.CURDIR}/../Makefile.inc