diff options
| author | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2015-09-02 04:09:25 +0000 |
|---|---|---|
| committer | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2015-09-02 04:09:25 +0000 |
| commit | 25c065e3fb0f3cf72fd4ccd77fbb5f3b9bf41e5d (patch) | |
| tree | 9300d5f16470a49c31de5f3c54ae45f6c4b97b38 /sys/arch/i386/stand/cdboot | |
| parent | 493c06b693cc5008b2512212aa374ee840d0a565 (diff) | |
Bring the boot changes on amd64 to i386. alloca is deleted.
Also fix the boot from BIOS and bump the version.
input and ok deraadt
Diffstat (limited to 'sys/arch/i386/stand/cdboot')
| -rw-r--r-- | sys/arch/i386/stand/cdboot/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/cdboot/conf.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/i386/stand/cdboot/Makefile b/sys/arch/i386/stand/cdboot/Makefile index a25af88214f..6306887a728 100644 --- a/sys/arch/i386/stand/cdboot/Makefile +++ b/sys/arch/i386/stand/cdboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2014/07/15 22:14:37 deraadt Exp $ +# $OpenBSD: Makefile,v 1.24 2015/09/02 04:09:24 yasuoka Exp $ MAN= cdboot.8 @@ -17,7 +17,7 @@ BINMODE=644 CLEANFILES+= crt0.o ${PROG}.whole .PATH: ${SADIR}/libsa -SRCS+= alloca.S debug_i386.S gidt.S random_i386.S +SRCS+= debug_i386.S gidt.S random_i386.S SRCS+= cmd_i386.c dev_i386.c exec_i386.c gateA20.c machdep.c SRCS+= apmprobe.c bioscons.c biosdev.c debug.c diskprobe.c memprobe.c \ pciprobe.c ps2probe.c time.c diff --git a/sys/arch/i386/stand/cdboot/conf.c b/sys/arch/i386/stand/cdboot/conf.c index fafd6619225..d188c1dd23e 100644 --- a/sys/arch/i386/stand/cdboot/conf.c +++ b/sys/arch/i386/stand/cdboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.24 2014/02/18 13:56:02 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.25 2015/09/02 04:09:24 yasuoka Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -44,7 +44,7 @@ #include <dev/cons.h> #include "debug.h" -const char version[] = "3.23"; +const char version[] = "3.24"; int debug = 1; #undef _TEST |