[src/trunk]: src/sys/arch/evbarm/integrator Fix the v6 boot check: A '6' in t...

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

details:   https://anonhg.NetBSD.org/src/rev/a275881a9f4d
branches:  trunk
changeset: 581109:a275881a9f4d
user:      rearnsha <rearnsha%NetBSD.org@localhost>
date:      Wed May 25 09:20:33 2005 +0000

description:
Fix the v6 boot check: A '6' in the architecture field really means
Architecture v5TEJ.

diffstat:

 sys/arch/evbarm/integrator/intmmu.S |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r 7465711f2e87 -r a275881a9f4d sys/arch/evbarm/integrator/intmmu.S
--- a/sys/arch/evbarm/integrator/intmmu.S       Wed May 25 06:46:07 2005 +0000
+++ b/sys/arch/evbarm/integrator/intmmu.S       Wed May 25 09:20:33 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intmmu.S,v 1.7 2005/05/21 11:46:56 rearnsha Exp $ */
+/*     $NetBSD: intmmu.S,v 1.8 2005/05/25 09:20:33 rearnsha Exp $ */
 
 /*
  * Copyright (c) 2001 ARM Ltd
@@ -56,11 +56,12 @@
  * if it has an MMU.  There's no simple test for this, but the following
  * hack should be sufficient for all currently supported CM boards.
  *  1) Check that the architecture is less than v6 (V6 has feature registers)
+ *     (v6 is indictate by '7' in bits 16-19).
  *  2) Check that the product code has a '2' in bits 8-11
  */
        mrc     p15, 0, r3, c0, c0, 0
        and     r0, r3, #0x000f0000
-       cmp     r0, #0x00060000
+       cmp     r0, #0x00070000
        bhs     Lno_v6
        and     r0, r3, #0x00000f00
        teq     r0, #0x00000200