Skip to contentSkip to conversation

ARM: Scorpion is a v7 architecture, not v6

PATCH In review Stephen Boyd 3 participants 5 messages Mar 4, 2013 – Mar 15, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: Scorpion is a v7 architecture, not v6

Scorpion processors have always been v7 CPUs. Fix the Kconfig text to reflect this.

---
 arch/arm/Kconfig |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/Kconfig +2 -2
index dedf02b..dc3bbbc 100644
@@ -1006,12 +1006,12 @@ config ARCH_MULTI_V4_V5
 	bool
 
 config ARCH_MULTI_V6
-	bool "ARMv6 based platforms (ARM11, Scorpion, ...)"
+	bool "ARMv6 based platforms (ARM11)"
 	select ARCH_MULTI_V6_V7
 	select CPU_V6
 
 config ARCH_MULTI_V7
-	bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)"
+	bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
 	default y
 	select ARCH_MULTI_V6_V7
 	select ARCH_VEXPRESS
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
#1 lore raw
Quoted 14 lines · Stephen Boyd

Scorpion processors have always been v7 CPUs. Fix the Kconfig text to reflect this.

---
 arch/arm/Kconfig |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/Kconfig +0 -0
index dedf02b..dc3bbbc 100644

arch/arm/Kconfig config ARCH_MULTI_V4_V5 · line 1011

Quoted 7 lines
arch/arm/Kconfig +1 -1
@@ -1006,12 +1006,12 @@ config ARCH_MULTI_V4_V5
        bool
 
 config ARCH_MULTI_V6
-       bool "ARMv6 based platforms (ARM11, Scorpion, ...)"
+       bool "ARMv6 based platforms (ARM11)"
        select ARCH_MULTI_V6_V7
        select CPU_V6

Sorry about that, my fault.

Was there also an ARMv6 core from Qualcomm, or did you only use ARM11 at the time?

Arnd

#2 lore raw
Quoted 11 lines · Arnd Bergmann

arch/arm/Kconfig config ARCH_MULTI_V4_V5 · line 1011

Quoted 5 lines · Stephen Boyd

config ARCH_MULTI_V6

arch/arm/Kconfig +1 -1
-       bool "ARMv6 based platforms (ARM11, Scorpion, ...)"
+       bool "ARMv6 based platforms (ARM11)"
        select ARCH_MULTI_V6_V7
        select CPU_V6

Sorry about that, my fault.

Was there also an ARMv6 core from Qualcomm, or did you only use ARM11 at the time?

I believe the v6 core in the Qualcomm chips was an ARM11.

David

Signature · 3 lines
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
#3 lore raw
In reply to Arnd Bergmann
Quoted 17 lines · Arnd Bergmann
Quoted 16 lines · Stephen Boyd

Scorpion processors have always been v7 CPUs. Fix the Kconfig text to reflect this.

---
 arch/arm/Kconfig |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/Kconfig +0 -0
index dedf02b..dc3bbbc 100644
@@ -1006,12 +1006,12 @@ config ARCH_MULTI_V4_V5
        bool
 
Quoted 6 lines

arch/arm/Kconfig config ARCH_MULTI_V4_V5 · line 1011

Quoted 5 lines
arch/arm/Kconfig +1 -1
 config ARCH_MULTI_V6
-       bool "ARMv6 based platforms (ARM11, Scorpion, ...)"
+       bool "ARMv6 based platforms (ARM11)"
        select ARCH_MULTI_V6_V7
        select CPU_V6

Sorry about that, my fault.

Can you pick this patch up from the mailing list? Otherwise I can try to route it through David's msm tree.

Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
#4 lore raw
Quoted 2 lines · Stephen Boyd

Can you pick this patch up from the mailing list? Otherwise I can try to route it through David's msm tree.

Ok, applied to the fixes branch now.

Arnd