Module Name: src
Committed By: isaki
Date: Sun Aug 16 07:03:45 UTC 2020
Modified Files:
src/distrib/sets/lists/base: md.x68k
src/distrib/x68k/floppies/bootfloppy.generic: Makefile
src/distrib/x68k/floppies/bootfloppy.sysinst: Makefile
src/sys/arch/x68k/stand: Makefile README
src/sys/arch/x68k/stand/xxboot: Makefile
Removed Files:
src/sys/arch/x68k/stand/boot_ustar: Makefile boot_ustar.S
boot_ustar.ldscript version
Log Message:
Replace boot_ustar with xxboot_ustarfs.
The old boot_ustar had many hard coding and was small(<1KB).
The new xxboot_ustarfs is a part of integrated larger(<8KB) xxboot.
We had to maintain three similar but not the same bootloaders, but
now we have two!
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/base/md.x68k
cvs rdiff -u -r1.9 -r1.10 \
src/distrib/x68k/floppies/bootfloppy.generic/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/distrib/x68k/floppies/bootfloppy.sysinst/Makefile
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x68k/stand/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x68k/stand/README
cvs rdiff -u -r1.30 -r0 src/sys/arch/x68k/stand/boot_ustar/Makefile
cvs rdiff -u -r1.12 -r0 src/sys/arch/x68k/stand/boot_ustar/boot_ustar.S
cvs rdiff -u -r1.6 -r0 src/sys/arch/x68k/stand/boot_ustar/boot_ustar.ldscript
cvs rdiff -u -r1.3 -r0 src/sys/arch/x68k/stand/boot_ustar/version
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/x68k/stand/xxboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/md.x68k
diff -u src/distrib/sets/lists/base/md.x68k:1.46 src/distrib/sets/lists/base/md.x68k:1.47
--- src/distrib/sets/lists/base/md.x68k:1.46 Sun Aug 11 22:29:02 2013
+++ src/distrib/sets/lists/base/md.x68k Sun Aug 16 07:03:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.x68k,v 1.46 2013/08/11 22:29:02 joerg Exp $
+# $NetBSD: md.x68k,v 1.47 2020/08/16 07:03:45 isaki Exp $
./dev/pow0 base-obsolete obsolete
./dev/pow1 base-obsolete obsolete
./usr/bin/bellctrl base-util-bin
@@ -9,7 +9,7 @@
./usr/bin/tvctrl base-util-bin
./usr/mdec/boot base-sysutil-bin
./usr/mdec/fdboot_ufs base-sysutil-bin
-./usr/mdec/fdboot_ustar base-sysutil-bin
+./usr/mdec/fdboot_ustar base-obsolete obsolete
./usr/mdec/installboot base-sysutil-bin
./usr/mdec/installboot.new base-obsolete obsolete
./usr/mdec/loadbsd.x base-sysutil-bin
@@ -24,6 +24,7 @@
./usr/mdec/xxboot_lfsv1 base-sysutil-bin
./usr/mdec/xxboot_lfsv2 base-sysutil-bin
./usr/mdec/xxboot_ufs base-sysutil-bin
+./usr/mdec/xxboot_ustarfs base-sysutil-bin
./usr/sbin/memswitch base-sysutil-bin
./usr/sbin/poffd base-obsolete obsolete
./usr/share/keymaps/x68k/ascii_kmap base-sys-share
Index: src/distrib/x68k/floppies/bootfloppy.generic/Makefile
diff -u src/distrib/x68k/floppies/bootfloppy.generic/Makefile:1.9 src/distrib/x68k/floppies/bootfloppy.generic/Makefile:1.10
--- src/distrib/x68k/floppies/bootfloppy.generic/Makefile:1.9 Tue Aug 5 15:40:58 2014
+++ src/distrib/x68k/floppies/bootfloppy.generic/Makefile Sun Aug 16 07:03:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/08/05 15:40:58 apb Exp $
+# $NetBSD: Makefile,v 1.10 2020/08/16 07:03:45 isaki Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -17,7 +17,7 @@ MDEC= ${DESTDIR}/usr/mdec
FLOPPY_NETBSD= netbsd.gz
# XXXDISTRIB: use MI installboot
FLOPPYINSTBOOT=\
- "dd if=${MDEC}/fdboot_ustar of=@IMAGE@ bs=8k count=1 conv=sync,notrunc"
+ "dd if=${MDEC}/xxboot_ustarfs of=@IMAGE@ bs=8k count=1 conv=sync,notrunc"
CLEANFILES+= ${BOOTNAME} netbsd.gz
Index: src/distrib/x68k/floppies/bootfloppy.sysinst/Makefile
diff -u src/distrib/x68k/floppies/bootfloppy.sysinst/Makefile:1.13 src/distrib/x68k/floppies/bootfloppy.sysinst/Makefile:1.14
--- src/distrib/x68k/floppies/bootfloppy.sysinst/Makefile:1.13 Sun Nov 4 13:12:10 2012
+++ src/distrib/x68k/floppies/bootfloppy.sysinst/Makefile Sun Aug 16 07:03:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/11/04 13:12:10 isaki Exp $
+# $NetBSD: Makefile,v 1.14 2020/08/16 07:03:45 isaki Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -19,7 +19,7 @@ KERNOBJ!= cd ${.CURDIR}/../instkernel &&
FLOPPY_NETBSD= ${KERNOBJ}/netbsd-INSTALL.gz
# XXXDISTRIB: use MI installboot
FLOPPYINSTBOOT=\
- "dd if=${MDEC}/fdboot_ustar of=@IMAGE@ bs=8k count=1 conv=sync,notrunc"
+ "dd if=${MDEC}/xxboot_ustarfs of=@IMAGE@ bs=8k count=1 conv=sync,notrunc"
CLEANFILES+= ${BOOTNAME}
Index: src/sys/arch/x68k/stand/Makefile
diff -u src/sys/arch/x68k/stand/Makefile:1.14 src/sys/arch/x68k/stand/Makefile:1.15
--- src/sys/arch/x68k/stand/Makefile:1.14 Fri Aug 14 03:29:23 2020
+++ src/sys/arch/x68k/stand/Makefile Sun Aug 16 07:03:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/08/14 03:29:23 isaki Exp $
+# $NetBSD: Makefile,v 1.15 2020/08/16 07:03:45 isaki Exp $
# host tools
SUBDIR= newdisk installboot
@@ -9,7 +9,6 @@ SUBDIR+= libdos libiocs libsa .WAIT
# standalone bootloaders
SUBDIR+= mboot
SUBDIR+= boot_ufs
-SUBDIR+= boot_ustar
SUBDIR+= xxboot
SUBDIR+= boot netboot
Index: src/sys/arch/x68k/stand/README
diff -u src/sys/arch/x68k/stand/README:1.1 src/sys/arch/x68k/stand/README:1.2
--- src/sys/arch/x68k/stand/README:1.1 Sat Jan 18 04:42:29 2020
+++ src/sys/arch/x68k/stand/README Sun Aug 16 07:03:45 2020
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.1 2020/01/18 04:42:29 isaki Exp $
+$NetBSD: README,v 1.2 2020/08/16 07:03:45 isaki Exp $
Primary bootloaders:
boot_ufs/
@@ -9,15 +9,14 @@ Primary bootloaders:
and can recognize Human68k partition table.
(See #ifdef SCSI_ADHOC_BOOTPART part for details)
- boot_ustar/
- is placed in floppy's sector#0 and loads secondary bootloader
- from subsequent USTARFS.
-
xxboot/
contains following variants.
* cdboot_cd9660
is placed in CD and loads secondary bootloader
from cd9660 filesystem.
+ * fdboot_ustarfs
+ is placed in floppy's sector#0 and loads secondary
+ bootloader from subsequent USTARFS.
* xxboot_ffsv1
* xxboot_ffsv2
* xxboot_lfsv1
Index: src/sys/arch/x68k/stand/xxboot/Makefile
diff -u src/sys/arch/x68k/stand/xxboot/Makefile:1.16 src/sys/arch/x68k/stand/xxboot/Makefile:1.17
--- src/sys/arch/x68k/stand/xxboot/Makefile:1.16 Fri Aug 14 03:29:23 2020
+++ src/sys/arch/x68k/stand/xxboot/Makefile Sun Aug 16 07:03:45 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2020/08/14 03:29:23 isaki Exp $
+# $NetBSD: Makefile,v 1.17 2020/08/16 07:03:45 isaki Exp $
SUBDIR+= cdboot_cd9660
+SUBDIR+= fdboot_ustarfs
SUBDIR+= xxboot_ffsv1
SUBDIR+= xxboot_ffsv2
SUBDIR+= xxboot_lfsv1
