Perform the mvme197 latency timer reprogramming in the boot blocks, in

addition to the kernel, and unconditionnaly handle all busswitch revision 1
based boards as horribly broken, even with 50MHz clocks.

Based on an report of an early 50MHz 197LE board being unable to boot,
due to memory corruption.

3 files changed, 5 insertions, 13 deletions

diff --git a/sys/arch/mvme88k/stand/bootxx/Makefile b/sys/arch/mvme88k/stand/bootxx/Makefile
index b6b4f3e2be9..7537fd4569c 100644
--- a/sys/arch/mvme88k/stand/bootxx/Makefile
+++ b/sys/arch/mvme88k/stand/bootxx/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.12 2008/04/02 21:53:17 miod Exp $
+#	$OpenBSD: Makefile,v 1.13 2008/09/19 20:18:03 miod Exp $
 
 S=	${.CURDIR}/../../../..
 DEFS=-DSTAGE2_RELOC=${STAGE2_RELOC}
@@ -13,7 +13,7 @@ CLEANFILES+=bootxx
 .include "${S}/arch/mvme88k/stand/libsa/Makefile.inc"
 .include "${S}/arch/mvme88k/stand/libz/Makefile.inc"
 
-SRCS=   bootxx.c conf.c version.c
+SRCS=   bootxx.c conf.c
 
 LIBS=	${LIBSA} ${LIBBUG} ${LIBZ}
 
diff --git a/sys/arch/mvme88k/stand/bootxx/bootxx.c b/sys/arch/mvme88k/stand/bootxx/bootxx.c
index 1006efa0731..b18943c6e64 100644
--- a/sys/arch/mvme88k/stand/bootxx/bootxx.c
+++ b/sys/arch/mvme88k/stand/bootxx/bootxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bootxx.c,v 1.7 2008/04/02 21:53:17 miod Exp $ */
+/*	$OpenBSD: bootxx.c,v 1.8 2008/09/19 20:18:03 miod Exp $ */
 
 /*
  * Copyright (c) 1994 Paul Kranenburg
@@ -65,8 +65,6 @@ size_t     	block_size = 512;	/* default */
 int     	block_count = MAXBLOCKNUM;	/* length of table */
 daddr_t 	block_table[MAXBLOCKNUM] = { 0 };
 
-extern		char *version;
-
 void	bugexec(void (*)());
 int	copyboot(struct open_file *, char *);
 
@@ -77,7 +75,8 @@ main()
 	char *addr;
 	int error;
 
-	printf("\nbootxx: first level bootstrap program [%s]\n", version);
+	board_setup();
+
 #ifdef DEBUG
 	printf("boot device: ctrl=%d, dev=%d\n",
 		bugargs.ctrl_lun, bugargs.dev_lun);
diff --git a/sys/arch/mvme88k/stand/bootxx/version.c b/sys/arch/mvme88k/stand/bootxx/version.c
deleted file mode 100644
index 242d1e86a58..00000000000
--- a/sys/arch/mvme88k/stand/bootxx/version.c
+++ /dev/null
@@ -1,7 +0,0 @@
-/*	$OpenBSD: version.c,v 1.3 2008/04/02 21:53:17 miod Exp $ */
-
-/*
- *	1.3	rewritten crt code, self-relocatable
- *	1.2	rewritten startup code and general cleanup
- */
-char *version = "1.2";