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/boot | |
| 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/boot')
| -rw-r--r-- | sys/arch/i386/stand/boot/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/boot/conf.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile index e37b2a54d21..87ed7a81d1c 100644 --- a/sys/arch/i386/stand/boot/Makefile +++ b/sys/arch/i386/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.56 2014/07/13 09:26:08 jasper Exp $ +# $OpenBSD: Makefile,v 1.57 2015/09/02 04:09:24 yasuoka Exp $ COPTS?= MAN?= boot.8 @@ -33,7 +33,7 @@ SRCS+= boot.c bootarg.c cmd.c vars.c .PATH: ${SADIR}/libsa SRCS+= debug_i386.S -SRCS+= alloca.S gidt.S random_i386.S +SRCS+= gidt.S random_i386.S SRCS+= apmprobe.c debug.c pciprobe.c ps2probe.c SRCS+= cmd_i386.c dev_i386.c exec_i386.c gateA20.c machdep.c SRCS+= bioscons.c biosdev.c diskprobe.c memprobe.c time.c diff --git a/sys/arch/i386/stand/boot/conf.c b/sys/arch/i386/stand/boot/conf.c index ad4531ae8c8..164887a5a2e 100644 --- a/sys/arch/i386/stand/boot/conf.c +++ b/sys/arch/i386/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.55 2014/02/18 13:56:02 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.56 2015/09/02 04:09:24 yasuoka Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -43,7 +43,7 @@ #include <dev/cons.h> #include "debug.h" -const char version[] = "3.26"; +const char version[] = "3.27"; int debug = 1; |