summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/stand/cdboot
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/cdboot
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/cdboot')
-rw-r--r--sys/arch/amd64/stand/cdboot/Makefile4
-rw-r--r--sys/arch/amd64/stand/cdboot/conf.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/stand/cdboot/Makefile b/sys/arch/amd64/stand/cdboot/Makefile
index 2eaf7783082..f32a8632a44 100644
--- a/sys/arch/amd64/stand/cdboot/Makefile
+++ b/sys/arch/amd64/stand/cdboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2004/10/09 21:15:21 mickey Exp $
+# $OpenBSD: Makefile,v 1.4 2005/05/03 13:18:05 tom Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -20,7 +20,7 @@ INSTALL_STRIP=
# 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/cdboot/conf.c b/sys/arch/amd64/stand/cdboot/conf.c
index e74ee752bfe..c106ed59413 100644
--- a/sys/arch/amd64/stand/cdboot/conf.c
+++ b/sys/arch/amd64/stand/cdboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.4 2005/05/03 13:02:45 tom Exp $ */
+/* $OpenBSD: conf.c,v 1.5 2005/05/03 13:18:05 tom Exp $ */
/*
* Copyright (c) 2004 Tom Cosgrove
@@ -42,7 +42,7 @@
#include <biosdev.h>
#include <dev/cons.h>
-const char version[] = "1.03";
+const char version[] = "1.04";
int debug = 1;