diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1999-08-18 17:13:20 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1999-08-18 17:13:20 +0000 |
| commit | d6ad15d2356dec99eeff67d57af58ee4297fc711 (patch) | |
| tree | 2c7bbb731984a5b2cd43f76844505465f4293b51 /sys/arch/hp300 | |
| parent | 8f34c663fc59d54f7ecc897a629200cecedd5605 (diff) | |
Default to loading bsd.rd from $OSREV/hp300/bsd.rd.
Diffstat (limited to 'sys/arch/hp300')
| -rw-r--r-- | sys/arch/hp300/stand/cdboot/Makefile | 6 | ||||
| -rw-r--r-- | sys/arch/hp300/stand/cdboot/cdboot.c | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sys/arch/hp300/stand/cdboot/Makefile b/sys/arch/hp300/stand/cdboot/Makefile index 684f16f8ed6..e138b31b86d 100644 --- a/sys/arch/hp300/stand/cdboot/Makefile +++ b/sys/arch/hp300/stand/cdboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 1999/08/16 09:43:08 downsj Exp $ +# $OpenBSD: Makefile,v 1.2 1999/08/18 17:13:19 downsj Exp $ PROG= cdboot @@ -6,7 +6,7 @@ NOMAN= .PATH: ${.CURDIR}/../uboot -CFLAGS= -O2 -msoft-float -I${.CURDIR}/../include \ +CFLAGS= -O2 -DOSREV=\"${OSREV}\" -msoft-float -I${.CURDIR}/../include \ -I${.CURDIR}/../libsa -I${.CURDIR}/../.. -I${.CURDIR}/../../.. \ -I${.CURDIR}/../../../.. @@ -34,4 +34,6 @@ install: cdboot.lif cdboot.raw ${MKBOOT_PROG} ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 cdboot.lif \ ${DESTDIR}/usr/mdec +cdboot.o: Makefile + .include <bsd.prog.mk> diff --git a/sys/arch/hp300/stand/cdboot/cdboot.c b/sys/arch/hp300/stand/cdboot/cdboot.c index 8d02953f286..47cd80cd8be 100644 --- a/sys/arch/hp300/stand/cdboot/cdboot.c +++ b/sys/arch/hp300/stand/cdboot/cdboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cdboot.c,v 1.2 1999/08/16 10:20:07 downsj Exp $ */ +/* $OpenBSD: cdboot.c,v 1.3 1999/08/18 17:13:19 downsj Exp $ */ /* $NetBSD: uboot.c,v 1.3 1997/04/27 21:17:13 thorpej Exp $ */ /*- @@ -64,6 +64,9 @@ extern const char version[]; */ char *name; char *names[] = { +#ifdef OSREV + OSREV "/hp300/bsd.rd", +#endif "bsd.rd", "bsd", "obsd", "bsd.old" }; #define NUMNAMES (sizeof(names) / sizeof(char *)) |