[src/netbsd-1-4]: src/sys/arch/mvme68k/mvme68k pullup 1.50->1.51 (Steve Woodf...

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a5a3a34f978a
branches:  netbsd-1-4
changeset: 468526:a5a3a34f978a
user:      perry <perry%NetBSD.org@localhost>
date:      Wed Apr 28 17:50:47 1999 +0000

description:
pullup 1.50->1.51 (Steve Woodford)

diffstat:

 sys/arch/mvme68k/mvme68k/locore.s |  22 +++-------------------
 1 files changed, 3 insertions(+), 19 deletions(-)

diffs (43 lines):

diff -r 7d1bc473332c -r a5a3a34f978a sys/arch/mvme68k/mvme68k/locore.s
--- a/sys/arch/mvme68k/mvme68k/locore.s Wed Apr 28 14:34:23 1999 +0000
+++ b/sys/arch/mvme68k/mvme68k/locore.s Wed Apr 28 17:50:47 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.48.2.1 1999/04/19 19:51:13 perry Exp $    */
+/*     $NetBSD: locore.s,v 1.48.2.2 1999/04/28 17:50:47 perry Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -63,22 +63,6 @@
 ASLOCAL(bug_vbr)
        .long   0
 
-#ifndef MVME147
-/*
- * Convert MEMC040 'msiz' bits into the
- * corresponding RAM size.
- */
-ASLOCAL(memc_msiz)
-       .long   0x00400000
-       .long   0x00800000
-       .long   0x01000000
-       .long   0x02000000
-       .long   0x04000000
-       .long   0x08000000
-       .long   0x00400000
-       .long   0x00400000
-#endif
-
 #include <mvme68k/mvme68k/vectors.s>
 
 
@@ -338,8 +322,8 @@
         */
        movql   #0x07,d0
        andb    0xfff43008,d0           | MEMC040/MEMECC Controller #1
-       ASRELOC(memc_msiz, a0)
-       movl    a0@(d0:w:4),d1          | Compute how many bytes of RAM
+       movl    #0x00400000,d1
+       lsll    d0,d1
 
 #if 0
        lea     0xfff43008,a0           | MEMC040/MEMECC Controller #1