remove some stuff to make the blocks slightly smaller. we could go further

still.  tested by matthieu

5 files changed, 15 insertions, 32 deletions

diff --git a/sys/arch/alpha/stand/boot/boot.c b/sys/arch/alpha/stand/boot/boot.c
index c9633fc6ea1..dc9b3c82e88 100644
--- a/sys/arch/alpha/stand/boot/boot.c
+++ b/sys/arch/alpha/stand/boot/boot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: boot.c,v 1.15 2003/06/02 23:27:43 millert Exp $	*/
+/*	$OpenBSD: boot.c,v 1.16 2004/07/05 19:59:20 deraadt Exp $	*/
 /*	$NetBSD: boot.c,v 1.10 1997/01/18 01:58:33 cgd Exp $	*/
 
 /*
@@ -54,7 +54,7 @@ int loadfile(char *, u_int64_t *);
 char boot_file[128];
 char boot_flags[128];
 
-extern char bootprog_name[], bootprog_rev[], bootprog_date[], bootprog_maker[];
+extern char bootprog_name[], bootprog_rev[];
 
 struct bootinfo_v1 bootinfo_v1;
 
@@ -64,14 +64,6 @@ extern vaddr_t ssym, esym;
 
 int debug;
 
-char *kernelnames[] = {
-	"bsd",
-	"bsd.bak",
-	"bsd.old",
-	"obsd",
-	NULL
-};
-
 int
 main()
 {
@@ -83,14 +75,11 @@ main()
 	init_prom_calls();
 
 	/* print a banner */
-	printf("%s, Revision %s (%s, %s)\n", bootprog_name, bootprog_rev,
-	    bootprog_maker, bootprog_date);
+	printf("%s %s\n", bootprog_name, bootprog_rev);
 
 	/* switch to OSF pal code. */
 	OSFpal();
 
-	printf("\n");
-
 	prom_getenv(PROM_E_BOOTED_FILE, boot_file, sizeof(boot_file));
 	prom_getenv(PROM_E_BOOTED_OSFLAGS, boot_flags, sizeof(boot_flags));
 
@@ -100,11 +89,8 @@ main()
 	if (boot_file[0] != '\0')
 		win = (loadfile(name = boot_file, &entry) == 0);
 	else
-		for (namep = kernelnames, win = 0; *namep != NULL && !win;
-		    namep++)
-			win = (loadfile(name = *namep, &entry) == 0);
+		win = (loadfile(name = "bsd", &entry) == 0);
 
-	printf("\n");
 	if (!win)
 		goto fail;
 
diff --git a/sys/arch/alpha/stand/boot/newvers.sh b/sys/arch/alpha/stand/boot/newvers.sh
index 52d98972d37..012d3cf713f 100644
--- a/sys/arch/alpha/stand/boot/newvers.sh
+++ b/sys/arch/alpha/stand/boot/newvers.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: newvers.sh,v 1.7 2003/06/02 23:27:44 millert Exp $
+#	$OpenBSD: newvers.sh,v 1.8 2004/07/05 19:59:20 deraadt Exp $
 #	$NetBSD: newvers.sh,v 1.3 1996/06/14 20:03:04 cgd Exp $
 #
 # Copyright (c) 1984, 1986, 1990, 1993
@@ -37,5 +37,5 @@ r=`awk ' { print $3 ; exit } ' < $1`
 
 echo "char bootprog_name[] = \"OpenBSD/Alpha Secondary Boot\";" > vers.c
 echo "char bootprog_rev[] = \"${r}\";" >> vers.c
-echo "char bootprog_date[] = \"${t}\";" >> vers.c
-echo "char bootprog_maker[] = \"${u}@${h}\";" >> vers.c
+#echo "char bootprog_date[] = \"${t}\";" >> vers.c
+#echo "char bootprog_maker[] = \"${u}@${h}\";" >> vers.c
diff --git a/sys/arch/alpha/stand/bootxx.c b/sys/arch/alpha/stand/bootxx.c
index 0dcf15ee611..19396e3e7b8 100644
--- a/sys/arch/alpha/stand/bootxx.c
+++ b/sys/arch/alpha/stand/bootxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bootxx.c,v 1.9 2002/03/14 01:26:27 millert Exp $	*/
+/*	$OpenBSD: bootxx.c,v 1.10 2004/07/05 19:59:17 deraadt Exp $	*/
 /*	$NetBSD: bootxx.c,v 1.4 1997/01/18 00:28:59 cgd Exp $	*/
 
 /*
@@ -147,7 +147,9 @@ main()
 		return;
 	}
 
+#if 0
 	puts("Jumping to entry point...\n");
+#endif
 	entry = (void (*)())loadaddr;
 	(*entry)();
 	puts("SECONDARY BOOT BLOCK RETURNED!\n");
diff --git a/sys/arch/alpha/stand/loadfile.c b/sys/arch/alpha/stand/loadfile.c
index 7fefd526799..2fd2ac4d5aa 100644
--- a/sys/arch/alpha/stand/loadfile.c
+++ b/sys/arch/alpha/stand/loadfile.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loadfile.c,v 1.14 2003/10/18 20:14:43 jmc Exp $	*/
+/*	$OpenBSD: loadfile.c,v 1.15 2004/07/05 19:59:17 deraadt Exp $	*/
 /*	$NetBSD: loadfile.c,v 1.3 1997/04/06 08:40:59 cgd Exp $	*/
 
 /*
@@ -83,7 +83,7 @@ loadfile(fname, entryp)
 	} hdr;
 	int fd, rval;
 
-	(void)printf("\nLoading %s...\n", fname);
+	(void)printf("Loading %s...\n", fname);
 
 	/* Open the file. */
 	rval = 1;
diff --git a/sys/arch/alpha/stand/netboot/netboot.c b/sys/arch/alpha/stand/netboot/netboot.c
index 5ce9b560a5b..4b49d756230 100644
--- a/sys/arch/alpha/stand/netboot/netboot.c
+++ b/sys/arch/alpha/stand/netboot/netboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netboot.c,v 1.5 2003/06/02 23:27:44 millert Exp $	*/
+/*	$OpenBSD: netboot.c,v 1.6 2004/07/05 19:59:20 deraadt Exp $	*/
 /*	$NetBSD: netboot.c,v 1.1 1996/09/18 20:03:12 cgd Exp $	*/
 
 /*
@@ -53,7 +53,7 @@ int loadfile(char *, u_int64_t *);
 char boot_file[128];
 char boot_flags[128];
 
-extern char bootprog_name[], bootprog_rev[], bootprog_date[], bootprog_maker[];
+extern char bootprog_name[], bootprog_rev[];
 
 vm_offset_t ffp_save, ptbr_save;
 
@@ -68,16 +68,11 @@ main()
 	init_prom_calls();
 
 	/* print a banner */
-	printf("\n");
-	printf("%s, Revision %s\n", bootprog_name, bootprog_rev);
-	printf("(%s, %s)\n", bootprog_maker, bootprog_date);
-	printf("\n");
+	printf("%s %s\n", bootprog_name, bootprog_rev);
 
 	/* switch to OSF pal code. */
 	OSFpal();
 
-	printf("\n");
-
 	prom_getenv(PROM_E_BOOTED_FILE, boot_file, sizeof(boot_file));
 	prom_getenv(PROM_E_BOOTED_OSFLAGS, boot_flags, sizeof(boot_flags));