summaryrefslogtreecommitdiff
path: root/sys/arch/sparc64
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-05-03 18:38:12 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-05-03 18:38:12 +0000
commita57f6a136dc1ecad3ef422187a576d421e348a95 (patch)
treee9903cadbc5e95f12695242032c2913ba0e6b03f /sys/arch/sparc64
parent75d4dd0cd8c10bb0404b8c740f914654055abaed (diff)
sensible version strings; ok miod
Diffstat (limited to 'sys/arch/sparc64')
-rw-r--r--sys/arch/sparc64/stand/ofwboot/Makefile5
-rw-r--r--sys/arch/sparc64/stand/ofwboot/boot.c6
-rw-r--r--sys/arch/sparc64/stand/ofwboot/vers.c1
3 files changed, 5 insertions, 7 deletions
diff --git a/sys/arch/sparc64/stand/ofwboot/Makefile b/sys/arch/sparc64/stand/ofwboot/Makefile
index 140a25b83fd..b3aa29533d9 100644
--- a/sys/arch/sparc64/stand/ofwboot/Makefile
+++ b/sys/arch/sparc64/stand/ofwboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2004/10/18 20:46:48 miod Exp $
+# $OpenBSD: Makefile,v 1.9 2007/05/03 18:38:11 deraadt Exp $
# $NetBSD: Makefile,v 1.2 2001/03/04 14:50:05 mrg Exp $
CURDIR= ${.CURDIR}
@@ -54,9 +54,6 @@ CPPFLAGS+= -DSPARC_BOOT_NFS
@([ -h machine ] || ln -s ${.CURDIR}/../../include machine)
.endif
-vers.c: version
- sh ${S}/conf/newvers.sh ${CURDIR}/version "sparc64" ${NEWVERSWHAT}
-
${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
${LD} -N -Ttext ${RELOC} -e ${ENTRY} -o ${PROG} \
${OBJS} -L${LIBSADIR} ${LIBSA} -L${LIBKERNDIR} ${LIBKERN} \
diff --git a/sys/arch/sparc64/stand/ofwboot/boot.c b/sys/arch/sparc64/stand/ofwboot/boot.c
index 7e854d019c2..936c376cd24 100644
--- a/sys/arch/sparc64/stand/ofwboot/boot.c
+++ b/sys/arch/sparc64/stand/ofwboot/boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: boot.c,v 1.12 2006/07/27 20:41:28 deraadt Exp $ */
+/* $OpenBSD: boot.c,v 1.13 2007/05/03 18:38:11 deraadt Exp $ */
/* $NetBSD: boot.c,v 1.3 2001/05/31 08:55:19 mrg Exp $ */
/*
* Copyright (c) 1997, 1999 Eduardo E. Horvath. All rights reserved.
@@ -284,7 +284,7 @@ main()
char **bootlp;
char *just_bootline[2];
- printf(">> %s", version);
+ printf(">> OpenBSD BOOT %s\n", version);
/*
* Get the boot arguments from Openfirmware
@@ -322,7 +322,7 @@ main()
bootlp = 0;
kernels[0] = 0; /* no more iteration */
} else if (cp != bootline) {
- printf(": trying %s...\n", cp);
+ printf("Trying %s...\n", cp);
strlcpy(bootline, cp, sizeof bootline);
}
}
diff --git a/sys/arch/sparc64/stand/ofwboot/vers.c b/sys/arch/sparc64/stand/ofwboot/vers.c
new file mode 100644
index 00000000000..8ead2a7553e
--- /dev/null
+++ b/sys/arch/sparc64/stand/ofwboot/vers.c
@@ -0,0 +1 @@
+const char version[] = "1.2";