[src/trunk]: src/sys/arch/arm/arm Simplify the simplification... basically al...

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

details:   https://anonhg.NetBSD.org/src/rev/8fb3becd15ac
branches:  trunk
changeset: 946568:8fb3becd15ac
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Dec 01 13:11:55 2020 +0000

description:
Simplify the simplification... basically always set sctlr.u before setting
cpsr.e

diffstat:

 sys/arch/arm/arm/armv6_start.S |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (23 lines):

diff -r 916d23db65e5 -r 8fb3becd15ac sys/arch/arm/arm/armv6_start.S
--- a/sys/arch/arm/arm/armv6_start.S    Tue Dec 01 10:10:57 2020 +0000
+++ b/sys/arch/arm/arm/armv6_start.S    Tue Dec 01 13:11:55 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: armv6_start.S,v 1.32 2020/12/01 08:35:31 skrll Exp $   */
+/*     $NetBSD: armv6_start.S,v 1.33 2020/12/01 13:11:55 skrll Exp $   */
 
 /*-
  * Copyright (c) 2012, 2017, 2018 The NetBSD Foundation, Inc.
@@ -96,12 +96,10 @@
 ENTRY_NP(generic_start)
 
 #if defined(__ARMEB__)
-#if defined(_ARM_ARCH_6)
-       /* Make sure U bit is always set with E bit in SCTLR. */
+       /* Make sure sctlr.u = 1 when cpsr.e = 1. */
        mrc     p15, 0, R_TMP1, c1, c0, 0
        orr     R_TMP1, R_TMP1, #CPU_CONTROL_UNAL_ENABLE
        mcr     p15, 0, R_TMP1, c1, c0, 0
-#endif
 
        setend  be                      /* force big endian */
 #endif