[src/trunk]: src/sys/arch/alpha/stand don't get the name from newvers, get it...

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

details:   https://anonhg.NetBSD.org/src/rev/629e447d14b2
branches:  trunk
changeset: 471594:629e447d14b2
user:      cgd <cgd%NetBSD.org@localhost>
date:      Mon Apr 05 06:42:14 1999 +0000

description:
don't get the name from newvers, get it from a bootstrap-specific -D
in the Makefile.  also, print the banner before we do things that
might cause us to print error messages.

diffstat:

 sys/arch/alpha/stand/boot/Makefile      |   3 ++-
 sys/arch/alpha/stand/common/boot.c      |  19 +++++++++++--------
 sys/arch/alpha/stand/netboot/Makefile   |   5 +++--
 sys/arch/alpha/stand/ustarboot/Makefile |   3 ++-
 4 files changed, 18 insertions(+), 12 deletions(-)

diffs (100 lines):

diff -r 18519ce464ad -r 629e447d14b2 sys/arch/alpha/stand/boot/Makefile
--- a/sys/arch/alpha/stand/boot/Makefile        Mon Apr 05 06:34:01 1999 +0000
+++ b/sys/arch/alpha/stand/boot/Makefile        Mon Apr 05 06:42:14 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 1999/04/02 03:20:00 cgd Exp $
+# $NetBSD: Makefile,v 1.25 1999/04/05 06:42:14 cgd Exp $
 
 PROG = boot
 
@@ -8,6 +8,7 @@
 BOOT_RELOC = ${SECONDARY_LOAD_ADDRESS}
 
 CPPFLAGS += ${SECONDARY_CPPFLAGS} \
+               -DBOOT_TYPE_NAME='"Secondary"' \
                -DLIBSA_SINGLE_DEVICE=blkdev \
                  -D"blkdevioctl(x,y,z)=EINVAL"
 
diff -r 18519ce464ad -r 629e447d14b2 sys/arch/alpha/stand/common/boot.c
--- a/sys/arch/alpha/stand/common/boot.c        Mon Apr 05 06:34:01 1999 +0000
+++ b/sys/arch/alpha/stand/common/boot.c        Mon Apr 05 06:42:14 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.18 1999/04/05 04:39:42 cgd Exp $ */
+/* $NetBSD: boot.c,v 1.19 1999/04/05 06:42:14 cgd Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -64,7 +64,7 @@
 
 struct bootinfo_v1 bootinfo_v1;
 
-extern char bootprog_name[], bootprog_rev[], bootprog_date[], bootprog_maker[];
+extern char bootprog_rev[], bootprog_date[], bootprog_maker[];
 
 paddr_t ffp_save, ptbr_save;
 
@@ -93,6 +93,15 @@
 
        /* Init prom callback vector. */
        init_prom_calls();
+
+       /* print a banner */
+       printf("\n");
+       printf("NetBSD/alpha " BOOT_TYPE_NAME " Bootstrap, Revision %s\n",
+           bootprog_rev);
+       printf("(%s, %s)\n", bootprog_maker, bootprog_date);
+       printf("\n");
+
+       /* set up the booted device descriptor */
 #if defined(UNIFIED_BOOTBLOCK)
         if (!booted_dev_open()) {
                 printf("Boot device (%s) open failed.\n",
@@ -103,12 +112,6 @@
        booted_dev_setfd(fd);
 #endif
 
-       /* print a banner */
-       printf("\n");
-       printf("%s, Revision %s\n", bootprog_name, bootprog_rev);
-       printf("(%s, %s)\n", bootprog_maker, bootprog_date);
-       printf("\n");
-
        /* switch to OSF pal code. */
        OSFpal();
 
diff -r 18519ce464ad -r 629e447d14b2 sys/arch/alpha/stand/netboot/Makefile
--- a/sys/arch/alpha/stand/netboot/Makefile     Mon Apr 05 06:34:01 1999 +0000
+++ b/sys/arch/alpha/stand/netboot/Makefile     Mon Apr 05 06:42:14 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 1999/04/02 03:20:00 cgd Exp $
+# $NetBSD: Makefile,v 1.19 1999/04/05 06:42:14 cgd Exp $
 
 PROG = netboot
 
@@ -11,7 +11,8 @@
 
 CLEANFILES+= vers.c vers.o ${PROG}.sym
 
-CPPFLAGS += ${UNIFIED_CPPFLAGS} -DSUPPORT_DHCP
+CPPFLAGS += ${UNIFIED_CPPFLAGS} -DSUPPORT_DHCP \
+               -DBOOT_TYPE_NAME='"Network"'
 
 ${PROG}: ${PROG}.sym
        @echo creating ${PROG} from ${PROG}.sym...
diff -r 18519ce464ad -r 629e447d14b2 sys/arch/alpha/stand/ustarboot/Makefile
--- a/sys/arch/alpha/stand/ustarboot/Makefile   Mon Apr 05 06:34:01 1999 +0000
+++ b/sys/arch/alpha/stand/ustarboot/Makefile   Mon Apr 05 06:42:14 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1999/04/02 09:13:28 cgd Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/05 06:42:15 cgd Exp $
 
 PROG = ustarboot
 
@@ -8,6 +8,7 @@
 BOOT_RELOC = ${UNIFIED_LOAD_ADDRESS}
 
 CPPFLAGS += ${UNIFIED_CPPFLAGS} \
+               -DBOOT_TYPE_NAME='"ustar"' \
                -DLIBSA_SINGLE_DEVICE=blkdev \
                  -D"blkdevioctl(x,y,z)=EINVAL" \
                -DLIBSA_SINGLE_FILESYSTEM=ustarfs