Module Name: src
Committed By: isaki
Date: Fri Aug 14 03:40:48 UTC 2020
Modified Files:
src/sys/arch/x68k/stand/xxboot: Makefile.xxboot
src/sys/arch/x68k/stand/xxboot/cdboot_cd9660: Makefile
src/sys/arch/x68k/stand/xxboot/xxboot_ffsv1: Makefile
src/sys/arch/x68k/stand/xxboot/xxboot_ffsv2: Makefile
src/sys/arch/x68k/stand/xxboot/xxboot_lfsv1: Makefile
src/sys/arch/x68k/stand/xxboot/xxboot_lfsv2: Makefile
Log Message:
Use fixed 'xx' instead of DEV and DEVDRV for simplicity.
There is no choice other than xx for now.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/x68k/stand/xxboot/Makefile.xxboot
cvs rdiff -u -r1.2 -r1.3 \
src/sys/arch/x68k/stand/xxboot/cdboot_cd9660/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x68k/stand/xxboot/xxboot_ffsv1/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x68k/stand/xxboot/xxboot_ffsv2/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x68k/stand/xxboot/xxboot_lfsv1/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x68k/stand/xxboot/xxboot_lfsv2/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/x68k/stand/xxboot/Makefile.xxboot
diff -u src/sys/arch/x68k/stand/xxboot/Makefile.xxboot:1.15 src/sys/arch/x68k/stand/xxboot/Makefile.xxboot:1.16
--- src/sys/arch/x68k/stand/xxboot/Makefile.xxboot:1.15 Fri Aug 14 03:29:23 2020
+++ src/sys/arch/x68k/stand/xxboot/Makefile.xxboot Fri Aug 14 03:40:47 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.xxboot,v 1.15 2020/08/14 03:29:23 isaki Exp $
+# $NetBSD: Makefile.xxboot,v 1.16 2020/08/14 03:40:47 isaki Exp $
NOMAN= # defined
.include <bsd.own.mk>
-BOOT= $(DEV)boot_$(FS)
+BOOT= xxboot_$(FS)
VERSIONFILE= ${.CURDIR}/../version
VERSION!= ${TOOL_AWK} -F: '$$1 ~ /^[0-9.]*$$/ { it = $$1; } \
END { print it }' ${VERSIONFILE}
@@ -25,7 +25,7 @@ BINMODE= 444
S= ${.CURDIR}/../../../../..
M= $S/arch/x68k
.PATH: ${.CURDIR}/..
-SRCS= boot.S bootmain.c conf.c consio1.c $(DEVDRV).c
+SRCS= boot.S bootmain.c conf.c consio1.c xx.c
.include "${S}/conf/newvers_stand.mk"
@@ -51,7 +51,7 @@ LDLIBS+= -L${LIBIOCS} -liocs
.PATH: $S/lib/libsa
CPPFLAGS+= -DLIBSA_SINGLE_FILESYSTEM=$(FS)
-CPPFLAGS+= -DLIBSA_SINGLE_DEVICE=$(DEV)
+CPPFLAGS+= -DLIBSA_SINGLE_DEVICE=xx
CPPFLAGS+= -DLIBSA_NO_FD_CHECKING
CPPFLAGS+= -DLIBSA_NO_FS_WRITE
CPPFLAGS+= -DLIBSA_NO_RAW_ACCESS
Index: src/sys/arch/x68k/stand/xxboot/cdboot_cd9660/Makefile
diff -u src/sys/arch/x68k/stand/xxboot/cdboot_cd9660/Makefile:1.2 src/sys/arch/x68k/stand/xxboot/cdboot_cd9660/Makefile:1.3
--- src/sys/arch/x68k/stand/xxboot/cdboot_cd9660/Makefile:1.2 Sat Nov 17 19:10:46 2012
+++ src/sys/arch/x68k/stand/xxboot/cdboot_cd9660/Makefile Fri Aug 14 03:40:47 2020
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile,v 1.2 2012/11/17 19:10:46 tsutsui Exp $
+# $NetBSD: Makefile,v 1.3 2020/08/14 03:40:47 isaki Exp $
-DEV= xx
-DEVDRV= xx
FS= cd9660
BOOTCPPFLAGS= -DCDBOOT
Index: src/sys/arch/x68k/stand/xxboot/xxboot_ffsv1/Makefile
diff -u src/sys/arch/x68k/stand/xxboot/xxboot_ffsv1/Makefile:1.4 src/sys/arch/x68k/stand/xxboot/xxboot_ffsv1/Makefile:1.5
--- src/sys/arch/x68k/stand/xxboot/xxboot_ffsv1/Makefile:1.4 Sat Nov 17 19:10:47 2012
+++ src/sys/arch/x68k/stand/xxboot/xxboot_ffsv1/Makefile Fri Aug 14 03:40:47 2020
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile,v 1.4 2012/11/17 19:10:47 tsutsui Exp $
+# $NetBSD: Makefile,v 1.5 2020/08/14 03:40:47 isaki Exp $
-DEV= xx
-DEVDRV= xx
FS= ffsv1
BOOTCPPFLAGS= -DSDBOOT -DFDBOOT
Index: src/sys/arch/x68k/stand/xxboot/xxboot_ffsv2/Makefile
diff -u src/sys/arch/x68k/stand/xxboot/xxboot_ffsv2/Makefile:1.4 src/sys/arch/x68k/stand/xxboot/xxboot_ffsv2/Makefile:1.5
--- src/sys/arch/x68k/stand/xxboot/xxboot_ffsv2/Makefile:1.4 Sat Nov 17 19:10:47 2012
+++ src/sys/arch/x68k/stand/xxboot/xxboot_ffsv2/Makefile Fri Aug 14 03:40:47 2020
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile,v 1.4 2012/11/17 19:10:47 tsutsui Exp $
+# $NetBSD: Makefile,v 1.5 2020/08/14 03:40:47 isaki Exp $
-DEV= xx
-DEVDRV= xx
FS= ffsv2
BOOTCPPFLAGS= -DSDBOOT -DFDBOOT
Index: src/sys/arch/x68k/stand/xxboot/xxboot_lfsv1/Makefile
diff -u src/sys/arch/x68k/stand/xxboot/xxboot_lfsv1/Makefile:1.4 src/sys/arch/x68k/stand/xxboot/xxboot_lfsv1/Makefile:1.5
--- src/sys/arch/x68k/stand/xxboot/xxboot_lfsv1/Makefile:1.4 Sat Nov 17 19:10:47 2012
+++ src/sys/arch/x68k/stand/xxboot/xxboot_lfsv1/Makefile Fri Aug 14 03:40:47 2020
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile,v 1.4 2012/11/17 19:10:47 tsutsui Exp $
+# $NetBSD: Makefile,v 1.5 2020/08/14 03:40:47 isaki Exp $
-DEV= xx
-DEVDRV= xx
FS= lfsv1
BOOTCPPFLAGS= -DSDBOOT -DFDBOOT
Index: src/sys/arch/x68k/stand/xxboot/xxboot_lfsv2/Makefile
diff -u src/sys/arch/x68k/stand/xxboot/xxboot_lfsv2/Makefile:1.4 src/sys/arch/x68k/stand/xxboot/xxboot_lfsv2/Makefile:1.5
--- src/sys/arch/x68k/stand/xxboot/xxboot_lfsv2/Makefile:1.4 Sat Nov 17 19:10:47 2012
+++ src/sys/arch/x68k/stand/xxboot/xxboot_lfsv2/Makefile Fri Aug 14 03:40:47 2020
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile,v 1.4 2012/11/17 19:10:47 tsutsui Exp $
+# $NetBSD: Makefile,v 1.5 2020/08/14 03:40:47 isaki Exp $
-DEV= xx
-DEVDRV= xx
FS= lfsv2
BOOTCPPFLAGS= -DSDBOOT -DFDBOOT
