Module Name: src
Committed By: skrll
Date: Tue Dec 1 13:11:55 UTC 2020
Modified Files:
src/sys/arch/arm/arm: armv6_start.S
Log Message:
Simplify the simplification... basically always set sctlr.u before setting
cpsr.e
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/arm/armv6_start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/armv6_start.S
diff -u src/sys/arch/arm/arm/armv6_start.S:1.32 src/sys/arch/arm/arm/armv6_start.S:1.33
--- src/sys/arch/arm/arm/armv6_start.S:1.32 Tue Dec 1 08:35:31 2020
+++ src/sys/arch/arm/arm/armv6_start.S Tue Dec 1 13:11:55 2020
@@ -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
