sync to 0616, retaining local diffs

3 files changed, 13 insertions, 12 deletions

diff --git a/sys/arch/alpha/stand/boot/Makefile b/sys/arch/alpha/stand/boot/Makefile
index 23c3c283e7c..1c79f284abb 100644
--- a/sys/arch/alpha/stand/boot/Makefile
+++ b/sys/arch/alpha/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 1995/11/23 02:39:20 cgd Exp $
+#	$NetBSD: Makefile,v 1.6 1996/04/12 01:35:15 cgd Exp $
 
 .PATH: ${.CURDIR}/.. ${.CURDIR}/../../../../lib/libsa
 
@@ -6,7 +6,7 @@ BOOT_PROG = boot
 BOOT_RELOC = ${SECONDARY_LOAD_ADDRESS}
 
 BOOT_SRCS = start.S boot.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
+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+= ntohl.c prom_swpal.S
diff --git a/sys/arch/alpha/stand/boot/boot.c b/sys/arch/alpha/stand/boot/boot.c
index 0abbb15e7e8..85daa6aa43e 100644
--- a/sys/arch/alpha/stand/boot/boot.c
+++ b/sys/arch/alpha/stand/boot/boot.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.4 1995/11/23 02:39:27 cgd Exp $	*/
+/*	$NetBSD: boot.c,v 1.6 1996/05/10 00:15:08 cgd Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -43,15 +43,15 @@
 
 #include <sys/param.h>
 #include <sys/exec.h>
+#include <sys/exec_ecoff.h>
 
 #include <machine/prom.h>
 
-#include "include/coff.h"
 #define _KERNEL
 #include "include/pte.h"
 
 static int aout_exec __P((int, struct exec *, u_int64_t *));
-static int coff_exec __P((int, struct exechdr *, u_int64_t *));
+static int coff_exec __P((int, struct ecoff_exechdr *, u_int64_t *));
 static int loadfile __P((char *, u_int64_t *));
 
 char line[64] = "/netbsd";
@@ -160,7 +160,7 @@ loadfile(fname, entryp)
 	struct devices *dp;
 	union {
 		struct exec aout;
-		struct exechdr coff;
+		struct ecoff_exechdr coff;
 	} hdr;
 	ssize_t nr;
 	int fd, rval;
@@ -179,7 +179,7 @@ loadfile(fname, entryp)
 	}
 
 	/* Exec a.out or COFF. */
-	rval = N_COFFBADMAG(hdr.coff.a) ?
+	rval = ECOFF_BADMAG(&hdr.coff) ?	/* XXX check aouthdr */
 	    aout_exec(fd, &hdr.aout, entryp) :
 	    coff_exec(fd, &hdr.coff, entryp);
 
@@ -237,13 +237,13 @@ aout_exec(fd, aout, entryp)
 static int
 coff_exec(fd, coff, entryp)
 	int fd;
-	struct exechdr *coff;
+	struct ecoff_exechdr *coff;
 	u_int64_t *entryp;
 {
 
 	/* Read in text. */
 	(void)printf("%lu", coff->a.tsize);
-	(void)lseek(fd, N_COFFTXTOFF(coff->f, coff->a), 0);
+	(void)lseek(fd, ECOFF_TXTOFF(coff), 0);
 	if (read(fd, (void *)coff->a.text_start, coff->a.tsize) !=
 	    coff->a.tsize) {
 		(void)printf("read text: %d\n", errno);
diff --git a/sys/arch/alpha/stand/boot/version b/sys/arch/alpha/stand/boot/version
index a7634431ffb..40daa71ed5d 100644
--- a/sys/arch/alpha/stand/boot/version
+++ b/sys/arch/alpha/stand/boot/version
@@ -1,7 +1,8 @@
-$NetBSD: version,v 1.4 1995/11/23 02:40:09 cgd Exp $
+$NetBSD: version,v 1.5 1996/05/09 23:54:18 cgd Exp $
 
 1.1:	Initial version
 1.2:	don't forget the Id string!
 1.3:	make it work on AlphaStations
-1.4:	Re-import from master sources.
-1.5:	Complete rewrite of boot block code.
+1.4-1:	Re-import from master sources
+1.4-2:	Complete rewrite of boot block code
+1.5:	Update for new ECOFF headers