diff options
| -rw-r--r-- | sys/arch/hppa/stand/boot/Makefile | 19 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/boot/conf.c | 6 |
2 files changed, 16 insertions, 9 deletions
diff --git a/sys/arch/hppa/stand/boot/Makefile b/sys/arch/hppa/stand/boot/Makefile index 24cb2db2b7f..fc1cbd1b7ec 100644 --- a/sys/arch/hppa/stand/boot/Makefile +++ b/sys/arch/hppa/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 1999/01/25 21:53:31 mickey Exp $ +# $OpenBSD: Makefile,v 1.6 1999/04/20 20:05:22 mickey Exp $ PROG= boot SRCS= srt0.S boot.c cmd.c vars.c bootarg.c conf.c @@ -6,7 +6,7 @@ SRCS= srt0.S boot.c cmd.c vars.c bootarg.c conf.c # AFLAGS+=-Wa,-a LD?= ld LDFLAGS+=-Bstatic -nostartfiles -nostdlib -N -Ttext $(LINKADDR) -LDFLAGS+=-T ${.CURDIR}/ld.script +LDFLAGS+=-T ${.CURDIR}/ld.script -Map boot.map #LDFLAGS+=-O -N -S -H -R$(LINKADDR) -e begin -t SIZE?= size MAN= boot.8 @@ -22,9 +22,16 @@ DPADD= ${LIBSA} ${LIBZ} ${LIBKERN} all: boot.lif -.if exists(${.CURDIR}/../../compile/DISKLESS/bsd) -bsd: ${.CURDIR}/../../compile/DISKLESS/bsd - gzip -9c ${.CURDIR}/../../compile/DISKLESS/bsd > bsd +# enable this when SHEPHERD dies +#.if exists(${.CURDIR}/../../compile/DISKLESS/bsd) +#bsd: ${.CURDIR}/../../compile/DISKLESS/bsd +# gzip -9c ${.CURDIR}/../../compile/DISKLESS/bsd > bsd +#ADDBOOT+=bsd +#.endif + +.if exists(${.CURDIR}/../../compile/SHEPHERD_PIE/bsd) +bsd: ${.CURDIR}/../../compile/SHEPHERD_PIE/bsd + gzip -9c ${.CURDIR}/../../compile/SHEPHERD_PIE/bsd > bsd ADDBOOT+=bsd .endif @@ -40,5 +47,5 @@ ${PROG}: $(OBJS) $(DPADD) .include <bsd.prog.mk> -CPPFLAGS+=${DEBUGFLAGS} -DRELOC=$(LOADADDR) +CPPFLAGS+=${DEBUGFLAGS} -DRELOC=${LOADADDR} -DHEAP_LIMIT=${HEAP_LIMIT} CFLAGS+=$(SACFLAGS) diff --git a/sys/arch/hppa/stand/boot/conf.c b/sys/arch/hppa/stand/boot/conf.c index 60d217838f3..e423fa62101 100644 --- a/sys/arch/hppa/stand/boot/conf.c +++ b/sys/arch/hppa/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.6 1999/01/25 21:53:31 mickey Exp $ */ +/* $OpenBSD: conf.c,v 1.7 1999/04/20 20:05:22 mickey Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -42,7 +42,7 @@ const char version[] = "0.04"; int debug = 1; const struct x_sw execsw[] = { - { "elf", elf_probe, elf_load, elf_ldsym }, + { "elf", elf_probe, elf_load/*, elf_ldsym */}, /* { "som", som_probe, som_load, som_ldsym }, */ { "" , NULL, NULL }, }; @@ -59,7 +59,7 @@ int nfsys = NENTS(file_system); struct devsw devsw[] = { { "ct", iodcstrategy, ctopen, ctclose, noioctl }, - { "sd", iodcstrategy, dkopen, dkclose, noioctl }, + { "dk", iodcstrategy, dkopen, dkclose, noioctl }, { "lf", iodcstrategy, lfopen, lfclose, noioctl } }; int ndevs = NENTS(devsw); |