Module Name: src
Committed By: rin
Date: Thu Feb 25 03:42:15 UTC 2021
Modified Files:
src/sys/arch/amiga/stand/bootblock: Makefile
src/sys/arch/amiga/stand/bootblock/boot: Makefile version xd.c
src/sys/arch/amiga/stand/bootblock/bootxx_ffs: Makefile
Added Files:
src/sys/arch/amiga/stand/bootblock/bootxx_ffsv2: Makefile
Log Message:
Add FFSv2 support for primary- and second-stage boot loaders.
Rename primary-stage boot for FFSv1 (and ustarfs) to bootxx_ffsv1 for clarity.
Bump version to 3.1.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amiga/stand/bootblock/Makefile
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/amiga/stand/bootblock/boot/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amiga/stand/bootblock/boot/version
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/amiga/stand/bootblock/boot/xd.c
cvs rdiff -u -r1.25 -r1.26 \
src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
cvs rdiff -u -r0 -r1.1 \
src/sys/arch/amiga/stand/bootblock/bootxx_ffsv2/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/stand/bootblock/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/Makefile:1.4 src/sys/arch/amiga/stand/bootblock/Makefile:1.5
--- src/sys/arch/amiga/stand/bootblock/Makefile:1.4 Tue Jul 6 05:59:57 2010
+++ src/sys/arch/amiga/stand/bootblock/Makefile Thu Feb 25 03:42:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/07/06 05:59:57 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2021/02/25 03:42:14 rin Exp $
.include <bsd.own.mk>
@@ -9,7 +9,7 @@ SUBDIR+=elf2bb
.endif
# but these:
-SUBDIR+=boot bootxx_ffs
+SUBDIR+=boot bootxx_ffs bootxx_ffsv2
.include <bsd.subdir.mk>
Index: src/sys/arch/amiga/stand/bootblock/boot/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.56 src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.57
--- src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.56 Sun Apr 9 14:51:52 2017
+++ src/sys/arch/amiga/stand/bootblock/boot/Makefile Thu Feb 25 03:42:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2017/04/09 14:51:52 christos Exp $
+# $NetBSD: Makefile,v 1.57 2021/02/25 03:42:14 rin Exp $
.include <bsd.init.mk>
.include <bsd.sys.mk> # for HOST_SH
@@ -40,7 +40,7 @@ BINDIR=/usr/mdec
COBJS = main.o console.o xd.o twiddle.o bzero.o gets.o
COBJS+= lseek.o open.o read.o close.o dev.o errno.o
-COBJS+= ufs.o ustarfs.o panic.o vers.o files.o
+COBJS+= ufs.o ustarfs.o ffsv2.o panic.o vers.o files.o
COBJS+= divdi3.o moddi3.o qdivrem.o
SOBJS = alloc.o ashrdi3.o ashldi3.o bcopy.o muldi3.o printf.o startit.o
Index: src/sys/arch/amiga/stand/bootblock/boot/version
diff -u src/sys/arch/amiga/stand/bootblock/boot/version:1.1 src/sys/arch/amiga/stand/bootblock/boot/version:1.2
--- src/sys/arch/amiga/stand/bootblock/boot/version:1.1 Mon Dec 17 05:41:13 2001
+++ src/sys/arch/amiga/stand/bootblock/boot/version Thu Feb 25 03:42:14 2021
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.1 2001/12/17 05:41:13 mhitch Exp $
+$NetBSD: version,v 1.2 2021/02/25 03:42:14 rin Exp $
NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this
file is important - make sure the entries are appended on end, last item
@@ -11,3 +11,4 @@ is taken as the current.
2.3: ???
2.4: Moved default command into fixed location for easy patching
3.0: Initial 2 stage amiga bootblocks
+3.1: Add support for FFSv2
Index: src/sys/arch/amiga/stand/bootblock/boot/xd.c
diff -u src/sys/arch/amiga/stand/bootblock/boot/xd.c:1.10 src/sys/arch/amiga/stand/bootblock/boot/xd.c:1.11
--- src/sys/arch/amiga/stand/bootblock/boot/xd.c:1.10 Sat Mar 14 21:04:04 2009
+++ src/sys/arch/amiga/stand/bootblock/boot/xd.c Thu Feb 25 03:42:14 2021
@@ -1,5 +1,5 @@
/*
- * $NetBSD: xd.c,v 1.10 2009/03/14 21:04:04 dsl Exp $
+ * $NetBSD: xd.c,v 1.11 2021/02/25 03:42:14 rin Exp $
*
* Copyright (c) 1996 Ignatios Souvatzis.
* Copyright (c) 1995 Waldi Ravens.
@@ -53,8 +53,13 @@ struct devsw devsw[] = {
};
struct fs_ops file_system[] = {
+#if !defined(_PRIMARY_BOOT) || BOOTXX_FFS_VERSION == 1
FS_OPS(ufs),
FS_OPS(ustarfs),
+#endif
+#if !defined(_PRIMARY_BOOT) || BOOTXX_FFS_VERSION == 2
+ FS_OPS(ffsv2),
+#endif
};
int nfsys = sizeof(file_system)/sizeof(struct fs_ops);
Index: src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile:1.25 src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile:1.26
--- src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile:1.25 Sun Apr 9 14:51:52 2017
+++ src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile Thu Feb 25 03:42:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/04/09 14:51:52 christos Exp $
+# $NetBSD: Makefile,v 1.26 2021/02/25 03:42:14 rin Exp $
.include <bsd.init.mk>
.include <bsd.sys.mk>
@@ -24,12 +24,21 @@ S= ${DIR_TOP}
.SUFFIXES:
.SUFFIXES: .out .o .po .pico .so .s .S .c .cc .C .f .y .l .ln .m4 .sh
-FILES= bootxx_ffs bootxx_fd
+.ifdef BOOTXX_FFSV2
+FILES= bootxx_ffsv2
+FSOBJS= ffsv2.o
+DEFS+= -DBOOTXX_FFS_VERSION=2
+.else
+FILES= bootxx_ffsv1 bootxx_fd
+FSOBJS= ufs.o ustarfs.o
+DEFS+= -DBOOTXX_FFS_VERSION=1
+.endif
+
BINDIR=/usr/mdec
COBJS = main.o console.o xd.o twiddle.o bzero.o gets.o
COBJS+= lseek.o open.o vers.o read.o close.o dev.o errno.o
-COBJS+= ufs.o ustarfs.o panic.o files.o
+COBJS+= ${FSOBJS} panic.o files.o
SOBJS = alloc.o ashrdi3.o ashldi3.o bcopy.o muldi3.o printf.o startit.o
SOBJS += strlen.o strcmp.o fstat.o
@@ -37,7 +46,7 @@ SOBJS += libstubs.o memcmp.o memmove.o m
OBJS+= $(SOBJS) $(COBJS)
-DEFS = -D_STANDALONE -DSA_EXEC_ANYOWNER -D_PRIMARY_BOOT -DSERCONSOLE
+DEFS+= -D_STANDALONE -DSA_EXEC_ANYOWNER -D_PRIMARY_BOOT -DSERCONSOLE
.NOPATH: ${OBJS} x.out f.out libboot.a xxstart.o
@@ -45,7 +54,7 @@ DEFS = -D_STANDALONE -DSA_EXEC_ANYOWNER
realall: ${FILES}
-CLEANFILES += bootxx_ffs bootxx_fd x.out f.out xxstart.o fdstart.o libboot.a
+CLEANFILES += ${FILES} x.out f.out xxstart.o fdstart.o libboot.a
VERSIONFILE=${.CURDIR}/../boot/version
VERSIONFLAGS+=-n
@@ -87,7 +96,11 @@ DEFS+= -D__daddr_t=int32_t
${_MKTARGET_COMPILE}
${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
-bootxx_ffs: x.out
+bootxx_ffsv1: x.out
+ ${_MKTARGET_CREATE}
+ ${RELOC2BB} x.out $@ || (${NM} -u x.out && false)
+
+bootxx_ffsv2: x.out
${_MKTARGET_CREATE}
${RELOC2BB} x.out $@ || (${NM} -u x.out && false)
Added files:
Index: src/sys/arch/amiga/stand/bootblock/bootxx_ffsv2/Makefile
diff -u /dev/null src/sys/arch/amiga/stand/bootblock/bootxx_ffsv2/Makefile:1.1
--- /dev/null Thu Feb 25 03:42:15 2021
+++ src/sys/arch/amiga/stand/bootblock/bootxx_ffsv2/Makefile Thu Feb 25 03:42:15 2021
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile,v 1.1 2021/02/25 03:42:15 rin Exp $
+
+BOOTXX_FFSV2= defined
+
+.PATH: ${.CURDIR}/../bootxx_ffs
+
+.include "../bootxx_ffs/Makefile"
