summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/stand/boot
diff options
context:
space:
mode:
authorTom Cosgrove <tom@cvs.openbsd.org>2005-05-03 13:18:06 +0000
committerTom Cosgrove <tom@cvs.openbsd.org>2005-05-03 13:18:06 +0000
commit0abf960e363302baa2c0397873d3df08b798e323 (patch)
treecec6879437eb2cc5896e05db845f34f7e71d58f7 /sys/arch/amd64/stand/boot
parentc52f261e4b7932fc610c4eb688acc22544d1dca3 (diff)
The return value from getEBDAaddr() (info) is not used in bios_E820(),
so nuke it. amd64 no longer needs biosprobe.c listed in SRCS. Trims 100 bytes from the boot blocks. Bump versions on boot, cdboot and pxeboot, as I'm getting cautious in my old age. ok weingart@
Diffstat (limited to 'sys/arch/amd64/stand/boot')
-rw-r--r--sys/arch/amd64/stand/boot/Makefile4
-rw-r--r--sys/arch/amd64/stand/boot/conf.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/stand/boot/Makefile b/sys/arch/amd64/stand/boot/Makefile
index cebb1bbc5b2..3939bd4e842 100644
--- a/sys/arch/amd64/stand/boot/Makefile
+++ b/sys/arch/amd64/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2004/05/17 22:49:46 drahn Exp $
+# $OpenBSD: Makefile,v 1.3 2005/05/03 13:18:05 tom Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -20,7 +20,7 @@ LDFLAGS+=-L/usr/libdata
# i386 stuff (so, it will possibly load in the same 64k)
SRCS+= machdep.c dev_i386.c exec_i386.c cmd_i386.c
SRCS+= gidt.S alloca.S biosdev.c bioscons.c gateA20.c \
- memprobe.c diskprobe.c time.c biosprobe.c
+ memprobe.c diskprobe.c time.c ## biosprobe.c
.PATH: ${S}/stand/boot
SRCS+= boot.c cmd.c vars.c bootarg.c
diff --git a/sys/arch/amd64/stand/boot/conf.c b/sys/arch/amd64/stand/boot/conf.c
index 7bc4c2dcdc5..49e06f6a877 100644
--- a/sys/arch/amd64/stand/boot/conf.c
+++ b/sys/arch/amd64/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.5 2005/05/03 13:02:45 tom Exp $ */
+/* $OpenBSD: conf.c,v 1.6 2005/05/03 13:18:05 tom Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -42,7 +42,7 @@
#include <biosdev.h>
#include <dev/cons.h>
-const char version[] = "2.09";
+const char version[] = "2.10";
int debug = 1;