summaryrefslogtreecommitdiff
path: root/sys/arch/alpha/stand/boot
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1996-11-27 19:54:57 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1996-11-27 19:54:57 +0000
commit1dad1624ba7e422be25efc3e4786b134b01353b0 (patch)
tree0a2572d465b5d92c9855630692b27b1bc0ba7733 /sys/arch/alpha/stand/boot
parent4a14488d7c63678946c8d94c72d01460307f1b49 (diff)
Make compilable in our env. Involved disabling ELF support,
reordering includes (due to -Wstrict-prototypes) and other -Wall goo
Diffstat (limited to 'sys/arch/alpha/stand/boot')
-rw-r--r--sys/arch/alpha/stand/boot/Makefile6
-rw-r--r--sys/arch/alpha/stand/boot/boot.c3
-rw-r--r--sys/arch/alpha/stand/boot/disk.c3
3 files changed, 7 insertions, 5 deletions
diff --git a/sys/arch/alpha/stand/boot/Makefile b/sys/arch/alpha/stand/boot/Makefile
index bf32ff1073a..6bfa14e729b 100644
--- a/sys/arch/alpha/stand/boot/Makefile
+++ b/sys/arch/alpha/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1996/10/30 22:40:38 niklas Exp $
+# $OpenBSD: Makefile,v 1.6 1996/11/27 19:54:51 niklas Exp $
# $NetBSD: Makefile,v 1.10 1996/10/18 06:01:41 thorpej Exp $
.PATH: ${.CURDIR}/.. ${.CURDIR}/../../../../lib/libsa
@@ -10,13 +10,13 @@ BOOT_SRCS = start.S boot.c loadfile.c disk.c conf.c prom.c prom_disp.S OSFpal.c
BOOT_SRCS+= alloc.c bzero.c close.c dev.c devopen.c disklabel.c dkcksum.c
BOOT_SRCS+= getfile.c gets.c ioctl.c lseek.c open.c printf.c read.c
-BOOT_SRCS+= strcmp.c ufs.c write.c bcopy.c filesystem.c strlen.c
+BOOT_SRCS+= strcmp.c ufs.c write.c filesystem.c strlen.c
BOOT_SRCS+= ntohl.c prom_swpal.S
BOOT_OBJS = ${BOOT_SRCS:N*.h:R:S/$/.o/g}
HEADERSIZE_PROG = headersize
-DEFNS= -DCOMPAT_UFS -DALPHA_BOOT_ECOFF -DALPHA_BOOT_ELF
+DEFNS= -DCOMPAT_UFS -DALPHA_BOOT_ECOFF # -DALPHA_BOOT_ELF
AFLAGS += -DASSEMBLER ${DEFNS}
CPPFLAGS += -I${.CURDIR}/../.. -I${.CURDIR}/../../../..
diff --git a/sys/arch/alpha/stand/boot/boot.c b/sys/arch/alpha/stand/boot/boot.c
index 706b614c072..2ddaef27e5d 100644
--- a/sys/arch/alpha/stand/boot/boot.c
+++ b/sys/arch/alpha/stand/boot/boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: boot.c,v 1.7 1996/11/27 12:07:55 mickey Exp $ */
+/* $OpenBSD: boot.c,v 1.8 1996/11/27 19:54:52 niklas Exp $ */
/* $NetBSD: boot.c,v 1.8 1996/09/17 22:00:26 cgd Exp $ */
/*
@@ -46,6 +46,7 @@
#include <sys/exec.h>
#include <sys/exec_ecoff.h>
+#include <machine/rpb.h>
#include <machine/prom.h>
#define _KERNEL
diff --git a/sys/arch/alpha/stand/boot/disk.c b/sys/arch/alpha/stand/boot/disk.c
index 5b70adf9a61..e29a2b2a116 100644
--- a/sys/arch/alpha/stand/boot/disk.c
+++ b/sys/arch/alpha/stand/boot/disk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disk.c,v 1.4 1996/10/30 22:40:42 niklas Exp $ */
+/* $OpenBSD: disk.c,v 1.5 1996/11/27 19:54:52 niklas Exp $ */
/* $NetBSD: disk.c,v 1.3 1995/11/23 02:39:40 cgd Exp $ */
/*
@@ -44,6 +44,7 @@
#include <sys/param.h>
#include <sys/disklabel.h>
+#include <machine/rpb.h>
#include <machine/prom.h>
#include "disk.h"