Allow armv7 efiboot(8) to read from an ffs2 filesystem. ok kettenis@

2 files changed, 7 insertions, 4 deletions

diff --git a/sys/arch/armv7/stand/efiboot/Makefile b/sys/arch/armv7/stand/efiboot/Makefile
index dde96053f34..82064728914 100644
--- a/sys/arch/armv7/stand/efiboot/Makefile
+++ b/sys/arch/armv7/stand/efiboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.15 2019/11/28 00:17:11 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.16 2020/03/01 15:04:48 otto Exp $
 
 NOMAN=		#
 
@@ -31,7 +31,7 @@ SRCS+=	alloc.c ctime.c exit.c getchar.c hexdump.c \
 SRCS+=	close.c closeall.c cons.c cread.c dev.c disklabel.c dkcksum.c fchmod.c \
 	fstat.c lseek.c open.c read.c readdir.c stat.c
 SRCS+=	loadfile.c arc4.c
-SRCS+=	ufs.c
+SRCS+=	ufs.c ufs2.c
 SRCS+=	arp.c ether.c globals.c in_cksum.c net.c netif.c netudp.c tftp.c
 
 .PATH:	${S}/lib/libkern/arch/arm ${S}/lib/libkern
diff --git a/sys/arch/armv7/stand/efiboot/conf.c b/sys/arch/armv7/stand/efiboot/conf.c
index 02fc2781c92..40bfe5a1419 100644
--- a/sys/arch/armv7/stand/efiboot/conf.c
+++ b/sys/arch/armv7/stand/efiboot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.22 2020/01/13 10:17:09 kettenis Exp $	*/
+/*	$OpenBSD: conf.c,v 1.23 2020/03/01 15:04:48 otto Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -32,6 +32,7 @@
 #include <lib/libsa/stand.h>
 #include <lib/libsa/tftp.h>
 #include <lib/libsa/ufs.h>
+#include <lib/libsa/ufs2.h>
 #include <dev/cons.h>
 
 #include <efi.h>
@@ -41,7 +42,7 @@
 #include "efidev.h"
 #include "efipxe.h"
 
-const char version[] = "1.9";
+const char version[] = "1.10";
 int	debug = 0;
 
 struct fs_ops file_system[] = {
@@ -51,6 +52,8 @@ struct fs_ops file_system[] = {
 	  tftp_stat,   tftp_readdir   },
 	{ ufs_open,    ufs_close,    ufs_read,    ufs_write,    ufs_seek,
 	  ufs_stat,    ufs_readdir,  ufs_fchmod },
+	{ ufs2_open,   ufs2_close,   ufs2_read,   ufs2_write,   ufs2_seek,
+	  ufs2_stat,   ufs2_readdir, ufs2_fchmod },
 };
 int nfsys = nitems(file_system);