Skip to contentSkip to conversation

ARM: armv7 fix spelling of SCTRL

PATCH In review Peng Fan 2 participants 2 messages Jan 29, 2015 – Feb 2, 2015 Arm (32-bit)

lore
Share & tools
lore

Peng Fan

author
#0 lore raw

PATCH 1/1 ARM: armv7 fix spelling of SCTRL

SCTLR is the abbreviation of System Control Register, so we should use SCTLR but not SCTRL.

---
 arch/arm/cpu/armv7/cpu.c   | 2 +-
 arch/arm/cpu/armv7/start.S | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/cpu/armv7/cpu.c +1 -1
index 01cdb7e..c56417d 100644
@@ -53,7 +53,7 @@ int cleanup_before_linux(void)
 	 * After D-cache is flushed and before it is disabled there may
 	 * be some new valid entries brought into the cache. We are sure
 	 * that these lines are not dirty and will not affect our execution.
-	 * (because unwinding the call-stack and setting a bit in CP15 SCTRL
+	 * (because unwinding the call-stack and setting a bit in CP15 SCTLR
 	 * is all we did during this. We have not pushed anything on to the
 	 * stack. Neither have we affected any static data)
 	 * So just invalidate the entire d-cache again to avoid coherency
arch/arm/cpu/armv7/start.S +3 -3
index fdc05b9..70048c1 100644
@@ -52,10 +52,10 @@ reset:
  * Continue to use ROM code vector only in OMAP4 spl)
  */
 #if !(defined(CONFIG_OMAP44XX) && defined(CONFIG_SPL_BUILD))
-	/* Set V=0 in CP15 SCTRL register - for VBAR to point to vector */
-	mrc	p15, 0, r0, c1, c0, 0	@ Read CP15 SCTRL Register
+	/* Set V=0 in CP15 SCTLR register - for VBAR to point to vector */
+	mrc	p15, 0, r0, c1, c0, 0	@ Read CP15 SCTLR Register
 	bic	r0, #CR_V		@ V = 0
-	mcr	p15, 0, r0, c1, c0, 0	@ Write CP15 SCTRL Register
+	mcr	p15, 0, r0, c1, c0, 0	@ Write CP15 SCTLR Register
 
 	/* Set vector address in CP15 VBAR register */
 	ldr	r0, =_start
Signature · 1 line
1.8.4
#1 lore raw
Quoted 4 lines · Peng Fan

SCTLR is the abbreviation of System Control Register, so we should use SCTLR but not SCTRL.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150202/043e4589/attachment.sig>