sync w/ 0430

1 files changed, 31 insertions, 1 deletions

diff --git a/sys/arch/vax/boot/autoconf.c b/sys/arch/vax/boot/autoconf.c
index 654d6a68680..ca08f01214a 100644
--- a/sys/arch/vax/boot/autoconf.c
+++ b/sys/arch/vax/boot/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.3 1995/09/16 13:34:20 ragge Exp $ */
+/*	$NetBSD: autoconf.c,v 1.5 1996/03/07 23:27:06 ragge Exp $ */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -47,6 +47,14 @@ static int uba750[]={0xf30000,0xf32000};
 static int uio750[]={0xfc0000,0xf80000};
 static int uda750[]={0772150};
 
+/* 11/780's only have 4, 8600 have 8 of these. */
+static int mba780[]={0x20010000,0x20012000,0x20014000,0x20016000,
+	0x22010000,0x22012000,0x22014000,0x22016000};
+static int uba780[]={0x20006000,0x20008000,0x2000a000,0x2000c000,
+	0x22006000,0x22008000,0x2200a000,0x2200c000};
+static int uio780[]={0x20100000,0x20140000,0x20180000,0x201c0000,
+	0x22100000,0x22140000,0x22180000,0x221c0000};
+
 static int uba630[]={0x20087800};
 static int uio630[]={0x30000000};
 #define qbdev(csr) (((csr) & 017777)-0x10000000)
@@ -67,6 +75,28 @@ autoconf()
 		printf("CPU type %d not supported by boot\n",i);
 		asm("halt");
 
+	case VAX_8600:
+		nmba = 8;
+		nuba = 8;
+		nuda = 1;
+		mbaaddr = mba780;
+		ubaaddr = uba780;
+		udaaddr = uda750;
+		uioaddr = uio780;
+		tmsaddr = 0774500;
+		break;
+
+	case VAX_780:
+		nmba = 4;
+		nuba = 4;
+		nuda = 1;
+		mbaaddr = mba780;
+		ubaaddr = uba780;
+		udaaddr = uda750;
+		uioaddr = uio780;
+		tmsaddr = 0774500;
+		break;
+
 	case VAX_750:
 		nmba = 3;
 		nuba = 2;