diff mbox

[1/2] ARM: berlin: add MACH_BERLIN_BG2Q symbol

Message ID 1395430757-8677-1-git-send-email-alexandre.belloni@free-electrons.com (mailing list archive)
State New, archived
Headers show

Commit Message

Alexandre Belloni March 21, 2014, 7:39 p.m. UTC
Now that we start supporting the Marvell Berlin BG2Q, add a symbol allowing to
differentiate that SoC from the other SoCs of the Berlin family.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 arch/arm/mach-berlin/Kconfig | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Sebastian Hesselbarth March 21, 2014, 9:42 p.m. UTC | #1
On 03/21/2014 08:39 PM, Alexandre Belloni wrote:
> Now that we start supporting the Marvell Berlin BG2Q, add a symbol allowing to
> differentiate that SoC from the other SoCs of the Berlin family.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

Applied to berlin/defconfig, Thanks!

> ---
>   arch/arm/mach-berlin/Kconfig | 7 +++++++
>   1 file changed, 7 insertions(+)
>
> diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
> index 7a02d222c378..0ff6f5877076 100644
> --- a/arch/arm/mach-berlin/Kconfig
> +++ b/arch/arm/mach-berlin/Kconfig
> @@ -24,6 +24,13 @@ config MACH_BERLIN_BG2CD
>   	select CPU_V7
>   	select HAVE_ARM_TWD if SMP
>
> +config MACH_BERLIN_BG2Q
> +	bool "Marvell Armada 1500 Pro (BG2-Q)"
> +	select CACHE_L2X0
> +	select CPU_V7
> +	select HAVE_ARM_TWD if SMP
> +	select HAVE_SMP
> +
>   endmenu
>
>   endif
>
Sebastian Hesselbarth April 22, 2014, 9:24 p.m. UTC | #2
On 03/21/2014 10:42 PM, Sebastian Hesselbarth wrote:
> On 03/21/2014 08:39 PM, Alexandre Belloni wrote:
>> Now that we start supporting the Marvell Berlin BG2Q, add a symbol
>> allowing to
>> differentiate that SoC from the other SoCs of the Berlin family.
>>
>> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> 
> Applied to berlin/defconfig, Thanks!
> 
>> ---
>>   arch/arm/mach-berlin/Kconfig | 7 +++++++
>>   1 file changed, 7 insertions(+)
>>
>> diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
>> index 7a02d222c378..0ff6f5877076 100644
>> --- a/arch/arm/mach-berlin/Kconfig
>> +++ b/arch/arm/mach-berlin/Kconfig
>> @@ -24,6 +24,13 @@ config MACH_BERLIN_BG2CD
>>       select CPU_V7
>>       select HAVE_ARM_TWD if SMP
>>
>> +config MACH_BERLIN_BG2Q
>> +    bool "Marvell Armada 1500 Pro (BG2-Q)"
>> +    select CACHE_L2X0
>> +    select CPU_V7
>> +    select HAVE_ARM_TWD if SMP
>> +    select HAVE_SMP

As Rob Herring pointed out, CPU_V7 is already selected by MULTI_V7.
Also, with no agreement on how to proceed with SMP, I also dropped
HAVE_SMP for now.

Sebastian


>>   endmenu
>>
>>   endif
>>
>
diff mbox

Patch

diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
index 7a02d222c378..0ff6f5877076 100644
--- a/arch/arm/mach-berlin/Kconfig
+++ b/arch/arm/mach-berlin/Kconfig
@@ -24,6 +24,13 @@  config MACH_BERLIN_BG2CD
 	select CPU_V7
 	select HAVE_ARM_TWD if SMP
 
+config MACH_BERLIN_BG2Q
+	bool "Marvell Armada 1500 Pro (BG2-Q)"
+	select CACHE_L2X0
+	select CPU_V7
+	select HAVE_ARM_TWD if SMP
+	select HAVE_SMP
+
 endmenu
 
 endif