diff options
| author | Steve Murphree <smurph@cvs.openbsd.org> | 2001-01-13 05:19:02 +0000 |
|---|---|---|
| committer | Steve Murphree <smurph@cvs.openbsd.org> | 2001-01-13 05:19:02 +0000 |
| commit | b2fc93362574ae97a3d3d367a3f18f9df09ebdec (patch) | |
| tree | e3ebfa043bcdf243dc7894f0f6187d022dca0628 /sys/arch/mvme88k/stand/bootsd | |
| parent | 2c2cdb496b2db4e6759169e9d396fbb519037c56 (diff) | |
Booting kernel with MACHINE_NEW_NONCONTIG. UVM code added but not working.
New stand config. Lots of header fixes. Can now cross-compile i386->m88k.
Diffstat (limited to 'sys/arch/mvme88k/stand/bootsd')
| -rw-r--r-- | sys/arch/mvme88k/stand/bootsd/Makefile | 10 | ||||
| -rw-r--r-- | sys/arch/mvme88k/stand/bootsd/boot.c | 16 |
2 files changed, 12 insertions, 14 deletions
diff --git a/sys/arch/mvme88k/stand/bootsd/Makefile b/sys/arch/mvme88k/stand/bootsd/Makefile index 2750dd421f3..693a192ed57 100644 --- a/sys/arch/mvme88k/stand/bootsd/Makefile +++ b/sys/arch/mvme88k/stand/bootsd/Makefile @@ -1,15 +1,13 @@ # from: @(#)Makefile 8.1 (Berkeley) 6/10/93 -# $OpenBSD: Makefile,v 1.6 1999/09/27 19:29:58 smurph Exp $ +# $OpenBSD: Makefile,v 1.7 2001/01/13 05:19:00 smurph Exp $ -# 8Meg - 64K -RELOC=0x7F0000 S= ${.CURDIR}/../../../.. DEFS= INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \ -I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa CFLAGS=-O0 ${INCPATH} ${DEFS} ${COPTS} -LDFLAGS=-N -T ${RELOC} +LDFLAGS=-N -T ${STAGE2_RELOC} CLEANFILES+=bootsd .include "${S}/arch/mvme88k/stand/bugcrt/Makefile.inc" @@ -28,9 +26,9 @@ ALL= ${BOOTS} all: ${ALL} -bootsd: ${OBJS} ${SDCRT} ${LIBS} +bootsd: ${OBJS} ${STAGE2} ${LIBS} ${LD} ${LDFLAGS} -o $@ \ - ${SDCRT} ${OBJS} ${LIBS} + ${STAGE2} ${OBJS} ${LIBS} install: install -c -m 555 -g bin -o bin ${BOOTS} ${DESTDIR}${MDEC_DIR} diff --git a/sys/arch/mvme88k/stand/bootsd/boot.c b/sys/arch/mvme88k/stand/bootsd/boot.c index c1c12c2ecab..cd23d6fafd2 100644 --- a/sys/arch/mvme88k/stand/bootsd/boot.c +++ b/sys/arch/mvme88k/stand/bootsd/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.4 1999/09/27 19:29:59 smurph Exp $ */ +/* $OpenBSD: boot.c,v 1.5 2001/01/13 05:19:00 smurph Exp $ */ /* $NetBSD: boot.c,v 1.2 1995/09/23 03:42:52 gwr Exp $ */ /*- @@ -52,21 +52,21 @@ int debug; int errno; extern char *version; -char line[80]; +char line[80]; int main() { char *cp, *file; - int io, flag, ret; - int ask = 0; + int io, flag, ret; + int ask = 0; printf("\n>> OpenBSD/mvme88k bootsd [%s]\n", version); ret = parse_args(&file, &flag); - if (flag & RB_ASKKERN) { - ask = 1; - } + if (flag & RB_ASKKERN) { + ask = 1; + } for (;;) { if (ask) { printf("boot: "); @@ -88,5 +88,5 @@ main() printf("boot: %s: %s\n", file, strerror(errno)); ask = 1; } - return(0); + return (0); } |