[src/trunk]: src/sys/arch/x68k/stand/xxboot Use fixed 'xx' instead of DEV and...

[isaki <isaki%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/487fdee3d57d
branches:  trunk
changeset: 1012887:487fdee3d57d
user:      isaki <isaki%NetBSD.org@localhost>
date:      Fri Aug 14 03:40:47 2020 +0000

description:
Use fixed 'xx' instead of DEV and DEVDRV for simplicity.
There is no choice other than xx for now.

diffstat:

 sys/arch/x68k/stand/xxboot/Makefile.xxboot        |  8 ++++----
 sys/arch/x68k/stand/xxboot/cdboot_cd9660/Makefile |  4 +---
 sys/arch/x68k/stand/xxboot/xxboot_ffsv1/Makefile  |  4 +---
 sys/arch/x68k/stand/xxboot/xxboot_ffsv2/Makefile  |  4 +---
 sys/arch/x68k/stand/xxboot/xxboot_lfsv1/Makefile  |  4 +---
 sys/arch/x68k/stand/xxboot/xxboot_lfsv2/Makefile  |  4 +---
 6 files changed, 9 insertions(+), 19 deletions(-)

diffs (94 lines):

diff -r 01243f239489 -r 487fdee3d57d sys/arch/x68k/stand/xxboot/Makefile.xxboot
--- a/sys/arch/x68k/stand/xxboot/Makefile.xxboot        Fri Aug 14 03:34:22 2020 +0000
+++ b/sys/arch/x68k/stand/xxboot/Makefile.xxboot        Fri Aug 14 03:40:47 2020 +0000
@@ -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 @@
 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 @@
 
 .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
diff -r 01243f239489 -r 487fdee3d57d sys/arch/x68k/stand/xxboot/cdboot_cd9660/Makefile
--- a/sys/arch/x68k/stand/xxboot/cdboot_cd9660/Makefile Fri Aug 14 03:34:22 2020 +0000
+++ b/sys/arch/x68k/stand/xxboot/cdboot_cd9660/Makefile Fri Aug 14 03:40:47 2020 +0000
@@ -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
 
diff -r 01243f239489 -r 487fdee3d57d sys/arch/x68k/stand/xxboot/xxboot_ffsv1/Makefile
--- a/sys/arch/x68k/stand/xxboot/xxboot_ffsv1/Makefile  Fri Aug 14 03:34:22 2020 +0000
+++ b/sys/arch/x68k/stand/xxboot/xxboot_ffsv1/Makefile  Fri Aug 14 03:40:47 2020 +0000
@@ -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
 
diff -r 01243f239489 -r 487fdee3d57d sys/arch/x68k/stand/xxboot/xxboot_ffsv2/Makefile
--- a/sys/arch/x68k/stand/xxboot/xxboot_ffsv2/Makefile  Fri Aug 14 03:34:22 2020 +0000
+++ b/sys/arch/x68k/stand/xxboot/xxboot_ffsv2/Makefile  Fri Aug 14 03:40:47 2020 +0000
@@ -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
 
diff -r 01243f239489 -r 487fdee3d57d sys/arch/x68k/stand/xxboot/xxboot_lfsv1/Makefile
--- a/sys/arch/x68k/stand/xxboot/xxboot_lfsv1/Makefile  Fri Aug 14 03:34:22 2020 +0000
+++ b/sys/arch/x68k/stand/xxboot/xxboot_lfsv1/Makefile  Fri Aug 14 03:40:47 2020 +0000
@@ -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
 
diff -r 01243f239489 -r 487fdee3d57d sys/arch/x68k/stand/xxboot/xxboot_lfsv2/Makefile
--- a/sys/arch/x68k/stand/xxboot/xxboot_lfsv2/Makefile  Fri Aug 14 03:34:22 2020 +0000
+++ b/sys/arch/x68k/stand/xxboot/xxboot_lfsv2/Makefile  Fri Aug 14 03:40:47 2020 +0000
@@ -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