From 951bfa96cbe713dbc0b6bd9ecfc0d762becac1d2 Mon Sep 17 00:00:00 2001
From: skrll <skrll@NetBSD.org>
Date: Tue, 1 Dec 2020 13:11:55 +0000
Subject: [PATCH] Simplify the simplification... basically always set sctlr.u
 before setting cpsr.e

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

diff --git a/sys/arch/arm/arm/armv6_start.S b/sys/arch/arm/arm/armv6_start.S
index 4d9542a9d9c2..9876a66d3566 100644
--- a/sys/arch/arm/arm/armv6_start.S
+++ b/sys/arch/arm/arm/armv6_start.S
@@ -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