diff mbox

[v3,02/13] ARM: append ARCH_MULTI_V7_LPAE

Message ID 1397801156-25682-3-git-send-email-haojian.zhuang@linaro.org (mailing list archive)
State New, archived
Headers show

Commit Message

Haojian Zhuang April 18, 2014, 6:05 a.m. UTC
Add new ARCH_MULTI_V7_LPAE config. It will select ARM_LPAE only both
ARCH_MULTI_V6 & ARCH_MULTI_V7 is disabled.

ARCH_MULTI_V7 means non-LPAE platform.

Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
---
 arch/arm/Kconfig               | 9 ++++++++-
 arch/arm/mach-berlin/Kconfig   | 2 +-
 arch/arm/mach-highbank/Kconfig | 2 +-
 arch/arm/mach-mvebu/Kconfig    | 6 +++---
 arch/arm/mach-omap2/Kconfig    | 4 ++--
 arch/arm/mach-qcom/Kconfig     | 2 +-
 arch/arm/mach-shmobile/Kconfig | 2 +-
 arch/arm/mach-tegra/Kconfig    | 2 +-
 arch/arm/mach-vexpress/Kconfig | 2 +-
 9 files changed, 19 insertions(+), 12 deletions(-)

Comments

Gregory CLEMENT April 18, 2014, 6:56 a.m. UTC | #1
Hi Haojian,

On 18/04/2014 08:05, Haojian Zhuang wrote:
> Add new ARCH_MULTI_V7_LPAE config. It will select ARM_LPAE only both
> ARCH_MULTI_V6 & ARCH_MULTI_V7 is disabled.
> 
> ARCH_MULTI_V7 means non-LPAE platform.
> 
> Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
> ---
>  arch/arm/Kconfig               | 9 ++++++++-
>  arch/arm/mach-berlin/Kconfig   | 2 +-
>  arch/arm/mach-highbank/Kconfig | 2 +-
>  arch/arm/mach-mvebu/Kconfig    | 6 +++---
>  arch/arm/mach-omap2/Kconfig    | 4 ++--
>  arch/arm/mach-qcom/Kconfig     | 2 +-
>  arch/arm/mach-shmobile/Kconfig | 2 +-
>  arch/arm/mach-tegra/Kconfig    | 2 +-
>  arch/arm/mach-vexpress/Kconfig | 2 +-
>  9 files changed, 19 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index ab438cb..9a2214e 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -918,12 +918,19 @@ config ARCH_MULTI_V6
>  	select CPU_V6K
>  
>  config ARCH_MULTI_V7
> -	bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
> +	bool "ARMv7 non-LPAE based platforms (Cortex-A5/A8/A9, PJ4, Scorpion)"
Actually some PJ4B are also non LPAE capable


>  	default y
>  	select ARCH_MULTI_V6_V7
>  	select CPU_V7
>  	select HAVE_SMP
>  
> +config ARCH_MULTI_V7_LPAE
> +	bool "ARMv7 LPAE based platforms (Cortex-A7/A12/A15/A17, Brahma-B15, PJ4B, Krait)"
Only Armada XP is LPAE capable, and and the CPU is not a "simple" PJ4B
but a PJ4B-MP

> +	select ARCH_MULTI_V6_V7
> +	select CPU_V7
> +	select HAVE_SMP
> +	select ARM_LPAE if !(ARCH_MULTI_V6 || ARCH_MULTI_V7)
> +
>  config ARCH_MULTI_V6_V7
>  	bool
>  	select MIGHT_HAVE_CACHE_L2X0
> diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
> index b0cb072..be0512d 100644
> --- a/arch/arm/mach-berlin/Kconfig
> +++ b/arch/arm/mach-berlin/Kconfig
> @@ -1,5 +1,5 @@
>  config ARCH_BERLIN
> -	bool "Marvell Berlin SoCs" if ARCH_MULTI_V7
> +	bool "Marvell Berlin SoCs" if (ARCH_MULTI_V7 || ARCH_MULTI_V7_LPAE)
>  	select ARM_GIC
>  	select GENERIC_IRQ_CHIP
>  	select DW_APB_ICTL
> diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig
> index 830b76e..9b6b3f8 100644
> --- a/arch/arm/mach-highbank/Kconfig
> +++ b/arch/arm/mach-highbank/Kconfig
> @@ -1,5 +1,5 @@
>  config ARCH_HIGHBANK
> -	bool "Calxeda ECX-1000/2000 (Highbank/Midway)" if ARCH_MULTI_V7
> +	bool "Calxeda ECX-1000/2000 (Highbank/Midway)" if ARCH_MULTI_V7_LPAE
>  	select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
>  	select ARCH_HAS_CPUFREQ
>  	select ARCH_HAS_HOLES_MEMORYMODEL
> diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
> index 3f73eec..16f69ae 100644
> --- a/arch/arm/mach-mvebu/Kconfig
> +++ b/arch/arm/mach-mvebu/Kconfig
> @@ -1,5 +1,5 @@
>  config ARCH_MVEBU
> -	bool "Marvell Engineering Business Unit (MVEBU) SoCs" if (ARCH_MULTI_V7 || ARCH_MULTI_V5)
> +	bool "Marvell Engineering Business Unit (MVEBU) SoCs" if (ARCH_MULTI_V7 || ARCH_MULTI_V7_LPAE || ARCH_MULTI_V5)
>  	select ARCH_SUPPORTS_BIG_ENDIAN
>  	select CLKSRC_MMIO
>  	select GENERIC_IRQ_CHIP
> @@ -23,7 +23,7 @@ config MACH_MVEBU_V7
>  	select CACHE_L2X0
>  
>  config MACH_ARMADA_370
> -	bool "Marvell Armada 370 boards" if ARCH_MULTI_V7
> +	bool "Marvell Armada 370 boards" if ARCH_MULTI_V7_LPAE
Armada 370 is not LPAE capable

>  	select ARMADA_370_CLK
>  	select CPU_PJ4B
>  	select MACH_MVEBU_V7
> @@ -59,7 +59,7 @@ config MACH_ARMADA_38X
>  	  on the Marvell Armada 380/385 SoC with device tree.
>  
>  config MACH_ARMADA_XP
> -	bool "Marvell Armada XP boards" if ARCH_MULTI_V7
> +	bool "Marvell Armada XP boards" if ARCH_MULTI_V7_LPAE
>  	select ARMADA_XP_CLK
>  	select CPU_PJ4B
>  	select MACH_MVEBU_V7


Thanks,

Gregory
Haojian Zhuang April 18, 2014, 7:08 a.m. UTC | #2
On 18 April 2014 14:56, Gregory CLEMENT
<gregory.clement@free-electrons.com> wrote:
> Hi Haojian,
>
> On 18/04/2014 08:05, Haojian Zhuang wrote:
>> Add new ARCH_MULTI_V7_LPAE config. It will select ARM_LPAE only both
>> ARCH_MULTI_V6 & ARCH_MULTI_V7 is disabled.
>>
>> ARCH_MULTI_V7 means non-LPAE platform.
>>
>> Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
>> ---
>>  arch/arm/Kconfig               | 9 ++++++++-
>>  arch/arm/mach-berlin/Kconfig   | 2 +-
>>  arch/arm/mach-highbank/Kconfig | 2 +-
>>  arch/arm/mach-mvebu/Kconfig    | 6 +++---
>>  arch/arm/mach-omap2/Kconfig    | 4 ++--
>>  arch/arm/mach-qcom/Kconfig     | 2 +-
>>  arch/arm/mach-shmobile/Kconfig | 2 +-
>>  arch/arm/mach-tegra/Kconfig    | 2 +-
>>  arch/arm/mach-vexpress/Kconfig | 2 +-
>>  9 files changed, 19 insertions(+), 12 deletions(-)
>>
>> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
>> index ab438cb..9a2214e 100644
>> --- a/arch/arm/Kconfig
>> +++ b/arch/arm/Kconfig
>> @@ -918,12 +918,19 @@ config ARCH_MULTI_V6
>>       select CPU_V6K
>>
>>  config ARCH_MULTI_V7
>> -     bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
>> +     bool "ARMv7 non-LPAE based platforms (Cortex-A5/A8/A9, PJ4, Scorpion)"
> Actually some PJ4B are also non LPAE capable
>
>
>>       default y
>>       select ARCH_MULTI_V6_V7
>>       select CPU_V7
>>       select HAVE_SMP
>>
>> +config ARCH_MULTI_V7_LPAE
>> +     bool "ARMv7 LPAE based platforms (Cortex-A7/A12/A15/A17, Brahma-B15, PJ4B, Krait)"
> Only Armada XP is LPAE capable, and and the CPU is not a "simple" PJ4B
> but a PJ4B-MP

Do you mind that I append CPU_PJ4B_MP?

>>
>>  config MACH_ARMADA_370
>> -     bool "Marvell Armada 370 boards" if ARCH_MULTI_V7
>> +     bool "Marvell Armada 370 boards" if ARCH_MULTI_V7_LPAE
> Armada 370 is not LPAE capable
>
>>       select ARMADA_370_CLK
>>       select CPU_PJ4B
>>       select MACH_MVEBU_V7
>> @@ -59,7 +59,7 @@ config MACH_ARMADA_38X
>>         on the Marvell Armada 380/385 SoC with device tree.
>>
>>  config MACH_ARMADA_XP
>> -     bool "Marvell Armada XP boards" if ARCH_MULTI_V7
>> +     bool "Marvell Armada XP boards" if ARCH_MULTI_V7_LPAE
>>       select ARMADA_XP_CLK
>>       select CPU_PJ4B
>>       select MACH_MVEBU_V7
>
>
> Thanks,
>
> Gregory
>
>
> --
> Gregory Clement, Free Electrons
> Kernel, drivers, real-time and embedded Linux
> development, consulting, training and support.
> http://free-electrons.com
Gregory CLEMENT April 18, 2014, 7:18 a.m. UTC | #3
On 18/04/2014 09:08, Haojian Zhuang wrote:
> On 18 April 2014 14:56, Gregory CLEMENT
> <gregory.clement@free-electrons.com> wrote:
>> Hi Haojian,
>>
>> On 18/04/2014 08:05, Haojian Zhuang wrote:
>>> Add new ARCH_MULTI_V7_LPAE config. It will select ARM_LPAE only both
>>> ARCH_MULTI_V6 & ARCH_MULTI_V7 is disabled.
>>>
>>> ARCH_MULTI_V7 means non-LPAE platform.
>>>
>>> Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
>>> ---
>>>  arch/arm/Kconfig               | 9 ++++++++-
>>>  arch/arm/mach-berlin/Kconfig   | 2 +-
>>>  arch/arm/mach-highbank/Kconfig | 2 +-
>>>  arch/arm/mach-mvebu/Kconfig    | 6 +++---
>>>  arch/arm/mach-omap2/Kconfig    | 4 ++--
>>>  arch/arm/mach-qcom/Kconfig     | 2 +-
>>>  arch/arm/mach-shmobile/Kconfig | 2 +-
>>>  arch/arm/mach-tegra/Kconfig    | 2 +-
>>>  arch/arm/mach-vexpress/Kconfig | 2 +-
>>>  9 files changed, 19 insertions(+), 12 deletions(-)
>>>
>>> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
>>> index ab438cb..9a2214e 100644
>>> --- a/arch/arm/Kconfig
>>> +++ b/arch/arm/Kconfig
>>> @@ -918,12 +918,19 @@ config ARCH_MULTI_V6
>>>       select CPU_V6K
>>>
>>>  config ARCH_MULTI_V7
>>> -     bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
>>> +     bool "ARMv7 non-LPAE based platforms (Cortex-A5/A8/A9, PJ4, Scorpion)"
>> Actually some PJ4B are also non LPAE capable
>>
>>
>>>       default y
>>>       select ARCH_MULTI_V6_V7
>>>       select CPU_V7
>>>       select HAVE_SMP
>>>
>>> +config ARCH_MULTI_V7_LPAE
>>> +     bool "ARMv7 LPAE based platforms (Cortex-A7/A12/A15/A17, Brahma-B15, PJ4B, Krait)"
>> Only Armada XP is LPAE capable, and and the CPU is not a "simple" PJ4B
>> but a PJ4B-MP
> 
> Do you mind that I append CPU_PJ4B_MP?

Currently we make no difference in the code between PJ4B and PJ4B-MP.
Moreover the ARCH_MULTI_V7_LPAE vs ARCH_MULTI_V7 si done by SoC not by
CPU.

Maybe I missed something, what is your proposal?

> 
>>>
>>>  config MACH_ARMADA_370
>>> -     bool "Marvell Armada 370 boards" if ARCH_MULTI_V7
>>> +     bool "Marvell Armada 370 boards" if ARCH_MULTI_V7_LPAE
>> Armada 370 is not LPAE capable
>>
>>>       select ARMADA_370_CLK
>>>       select CPU_PJ4B
>>>       select MACH_MVEBU_V7
>>> @@ -59,7 +59,7 @@ config MACH_ARMADA_38X
>>>         on the Marvell Armada 380/385 SoC with device tree.
>>>
>>>  config MACH_ARMADA_XP
>>> -     bool "Marvell Armada XP boards" if ARCH_MULTI_V7
>>> +     bool "Marvell Armada XP boards" if ARCH_MULTI_V7_LPAE
>>>       select ARMADA_XP_CLK
>>>       select CPU_PJ4B
>>>       select MACH_MVEBU_V7
>>
>>
>> Thanks,
>>
>> Gregory
>>
>>
>> --
>> Gregory Clement, Free Electrons
>> Kernel, drivers, real-time and embedded Linux
>> development, consulting, training and support.
>> http://free-electrons.com
Haojian Zhuang April 18, 2014, 7:40 a.m. UTC | #4
On 18 April 2014 15:18, Gregory CLEMENT
<gregory.clement@free-electrons.com> wrote:
> On 18/04/2014 09:08, Haojian Zhuang wrote:
>> On 18 April 2014 14:56, Gregory CLEMENT
>> <gregory.clement@free-electrons.com> wrote:
>>> Hi Haojian,
>>>
>>> On 18/04/2014 08:05, Haojian Zhuang wrote:
>>>> Add new ARCH_MULTI_V7_LPAE config. It will select ARM_LPAE only both
>>>> ARCH_MULTI_V6 & ARCH_MULTI_V7 is disabled.
>>>>
>>>> ARCH_MULTI_V7 means non-LPAE platform.
>>>>
>>>> Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
>>>> ---
>>>>  arch/arm/Kconfig               | 9 ++++++++-
>>>>  arch/arm/mach-berlin/Kconfig   | 2 +-
>>>>  arch/arm/mach-highbank/Kconfig | 2 +-
>>>>  arch/arm/mach-mvebu/Kconfig    | 6 +++---
>>>>  arch/arm/mach-omap2/Kconfig    | 4 ++--
>>>>  arch/arm/mach-qcom/Kconfig     | 2 +-
>>>>  arch/arm/mach-shmobile/Kconfig | 2 +-
>>>>  arch/arm/mach-tegra/Kconfig    | 2 +-
>>>>  arch/arm/mach-vexpress/Kconfig | 2 +-
>>>>  9 files changed, 19 insertions(+), 12 deletions(-)
>>>>
>>>> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
>>>> index ab438cb..9a2214e 100644
>>>> --- a/arch/arm/Kconfig
>>>> +++ b/arch/arm/Kconfig
>>>> @@ -918,12 +918,19 @@ config ARCH_MULTI_V6
>>>>       select CPU_V6K
>>>>
>>>>  config ARCH_MULTI_V7
>>>> -     bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
>>>> +     bool "ARMv7 non-LPAE based platforms (Cortex-A5/A8/A9, PJ4, Scorpion)"
>>> Actually some PJ4B are also non LPAE capable
>>>
>>>
>>>>       default y
>>>>       select ARCH_MULTI_V6_V7
>>>>       select CPU_V7
>>>>       select HAVE_SMP
>>>>
>>>> +config ARCH_MULTI_V7_LPAE
>>>> +     bool "ARMv7 LPAE based platforms (Cortex-A7/A12/A15/A17, Brahma-B15, PJ4B, Krait)"
>>> Only Armada XP is LPAE capable, and and the CPU is not a "simple" PJ4B
>>> but a PJ4B-MP
>>
>> Do you mind that I append CPU_PJ4B_MP?
>
> Currently we make no difference in the code between PJ4B and PJ4B-MP.
> Moreover the ARCH_MULTI_V7_LPAE vs ARCH_MULTI_V7 si done by SoC not by
> CPU.
>
> Maybe I missed something, what is your proposal?
>

Since they're same between PJ4B & PJ4B-MP, I shouldn't append a new PJ4B_MP.

I'll only use both ARCH_MULTI_V7 & ARCH_MULTI_V7_LPAE as the
precondition on ARMADA_XP. I'll keep ARCH_MULTI_V7 as the precondition
on other armada chips in mach-berlin directory.

So when multi_v7_lpae_defconfig is appended, only ARMADA_XP is built
from mach-berlin directory. Is it OK?

Regards
Haojian
Gregory CLEMENT April 18, 2014, 7:44 a.m. UTC | #5
On 18/04/2014 09:40, Haojian Zhuang wrote:
> On 18 April 2014 15:18, Gregory CLEMENT
> <gregory.clement@free-electrons.com> wrote:
>> On 18/04/2014 09:08, Haojian Zhuang wrote:
>>> On 18 April 2014 14:56, Gregory CLEMENT
>>> <gregory.clement@free-electrons.com> wrote:
>>>> Hi Haojian,
>>>>
>>>> On 18/04/2014 08:05, Haojian Zhuang wrote:
>>>>> Add new ARCH_MULTI_V7_LPAE config. It will select ARM_LPAE only both
>>>>> ARCH_MULTI_V6 & ARCH_MULTI_V7 is disabled.
>>>>>
>>>>> ARCH_MULTI_V7 means non-LPAE platform.
>>>>>
>>>>> Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
>>>>> ---
>>>>>  arch/arm/Kconfig               | 9 ++++++++-
>>>>>  arch/arm/mach-berlin/Kconfig   | 2 +-
>>>>>  arch/arm/mach-highbank/Kconfig | 2 +-
>>>>>  arch/arm/mach-mvebu/Kconfig    | 6 +++---
>>>>>  arch/arm/mach-omap2/Kconfig    | 4 ++--
>>>>>  arch/arm/mach-qcom/Kconfig     | 2 +-
>>>>>  arch/arm/mach-shmobile/Kconfig | 2 +-
>>>>>  arch/arm/mach-tegra/Kconfig    | 2 +-
>>>>>  arch/arm/mach-vexpress/Kconfig | 2 +-
>>>>>  9 files changed, 19 insertions(+), 12 deletions(-)
>>>>>
>>>>> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
>>>>> index ab438cb..9a2214e 100644
>>>>> --- a/arch/arm/Kconfig
>>>>> +++ b/arch/arm/Kconfig
>>>>> @@ -918,12 +918,19 @@ config ARCH_MULTI_V6
>>>>>       select CPU_V6K
>>>>>
>>>>>  config ARCH_MULTI_V7
>>>>> -     bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
>>>>> +     bool "ARMv7 non-LPAE based platforms (Cortex-A5/A8/A9, PJ4, Scorpion)"
>>>> Actually some PJ4B are also non LPAE capable
>>>>
>>>>
>>>>>       default y
>>>>>       select ARCH_MULTI_V6_V7
>>>>>       select CPU_V7
>>>>>       select HAVE_SMP
>>>>>
>>>>> +config ARCH_MULTI_V7_LPAE
>>>>> +     bool "ARMv7 LPAE based platforms (Cortex-A7/A12/A15/A17, Brahma-B15, PJ4B, Krait)"
>>>> Only Armada XP is LPAE capable, and and the CPU is not a "simple" PJ4B
>>>> but a PJ4B-MP
>>>
>>> Do you mind that I append CPU_PJ4B_MP?
>>
>> Currently we make no difference in the code between PJ4B and PJ4B-MP.
>> Moreover the ARCH_MULTI_V7_LPAE vs ARCH_MULTI_V7 si done by SoC not by
>> CPU.
>>
>> Maybe I missed something, what is your proposal?
>>
> 
> Since they're same between PJ4B & PJ4B-MP, I shouldn't append a new PJ4B_MP.
> 
> I'll only use both ARCH_MULTI_V7 & ARCH_MULTI_V7_LPAE as the
> precondition on ARMADA_XP. I'll keep ARCH_MULTI_V7 as the precondition
> on other armada chips in mach-berlin directory.

In mach-mvebu actually

> 
> So when multi_v7_lpae_defconfig is appended, only ARMADA_XP is built
> from mach-berlin directory. Is it OK?

ARMADA_XP is in mach-mvebu directory, but beside this typo I am OK :)

By the way I am really happy to have the possibility to build now a
multi_v7_lpae image.


Thanks,

Gregory


> 
> Regards
> Haojian
>
diff mbox

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ab438cb..9a2214e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -918,12 +918,19 @@  config ARCH_MULTI_V6
 	select CPU_V6K
 
 config ARCH_MULTI_V7
-	bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
+	bool "ARMv7 non-LPAE based platforms (Cortex-A5/A8/A9, PJ4, Scorpion)"
 	default y
 	select ARCH_MULTI_V6_V7
 	select CPU_V7
 	select HAVE_SMP
 
+config ARCH_MULTI_V7_LPAE
+	bool "ARMv7 LPAE based platforms (Cortex-A7/A12/A15/A17, Brahma-B15, PJ4B, Krait)"
+	select ARCH_MULTI_V6_V7
+	select CPU_V7
+	select HAVE_SMP
+	select ARM_LPAE if !(ARCH_MULTI_V6 || ARCH_MULTI_V7)
+
 config ARCH_MULTI_V6_V7
 	bool
 	select MIGHT_HAVE_CACHE_L2X0
diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
index b0cb072..be0512d 100644
--- a/arch/arm/mach-berlin/Kconfig
+++ b/arch/arm/mach-berlin/Kconfig
@@ -1,5 +1,5 @@ 
 config ARCH_BERLIN
-	bool "Marvell Berlin SoCs" if ARCH_MULTI_V7
+	bool "Marvell Berlin SoCs" if (ARCH_MULTI_V7 || ARCH_MULTI_V7_LPAE)
 	select ARM_GIC
 	select GENERIC_IRQ_CHIP
 	select DW_APB_ICTL
diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig
index 830b76e..9b6b3f8 100644
--- a/arch/arm/mach-highbank/Kconfig
+++ b/arch/arm/mach-highbank/Kconfig
@@ -1,5 +1,5 @@ 
 config ARCH_HIGHBANK
-	bool "Calxeda ECX-1000/2000 (Highbank/Midway)" if ARCH_MULTI_V7
+	bool "Calxeda ECX-1000/2000 (Highbank/Midway)" if ARCH_MULTI_V7_LPAE
 	select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
 	select ARCH_HAS_CPUFREQ
 	select ARCH_HAS_HOLES_MEMORYMODEL
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 3f73eec..16f69ae 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -1,5 +1,5 @@ 
 config ARCH_MVEBU
-	bool "Marvell Engineering Business Unit (MVEBU) SoCs" if (ARCH_MULTI_V7 || ARCH_MULTI_V5)
+	bool "Marvell Engineering Business Unit (MVEBU) SoCs" if (ARCH_MULTI_V7 || ARCH_MULTI_V7_LPAE || ARCH_MULTI_V5)
 	select ARCH_SUPPORTS_BIG_ENDIAN
 	select CLKSRC_MMIO
 	select GENERIC_IRQ_CHIP
@@ -23,7 +23,7 @@  config MACH_MVEBU_V7
 	select CACHE_L2X0
 
 config MACH_ARMADA_370
-	bool "Marvell Armada 370 boards" if ARCH_MULTI_V7
+	bool "Marvell Armada 370 boards" if ARCH_MULTI_V7_LPAE
 	select ARMADA_370_CLK
 	select CPU_PJ4B
 	select MACH_MVEBU_V7
@@ -59,7 +59,7 @@  config MACH_ARMADA_38X
 	  on the Marvell Armada 380/385 SoC with device tree.
 
 config MACH_ARMADA_XP
-	bool "Marvell Armada XP boards" if ARCH_MULTI_V7
+	bool "Marvell Armada XP boards" if ARCH_MULTI_V7_LPAE
 	select ARMADA_XP_CLK
 	select CPU_PJ4B
 	select MACH_MVEBU_V7
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index cb31d43..1958791 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -41,7 +41,7 @@  config ARCH_OMAP4
 
 config SOC_OMAP5
 	bool "TI OMAP5"
-	depends on ARCH_MULTI_V7
+	depends on ARCH_MULTI_V7_LPAE
 	select ARCH_OMAP2PLUS
 	select ARCH_HAS_OPP
 	select ARM_CPU_SUSPEND if PM
@@ -68,7 +68,7 @@  config SOC_AM43XX
 
 config SOC_DRA7XX
 	bool "TI DRA7XX"
-	depends on ARCH_MULTI_V7
+	depends on ARCH_MULTI_V7_LPAE
 	select ARCH_OMAP2PLUS
 	select ARCH_HAS_OPP
 	select ARM_CPU_SUSPEND if PM
diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig
index a028be2..0da77d2 100644
--- a/arch/arm/mach-qcom/Kconfig
+++ b/arch/arm/mach-qcom/Kconfig
@@ -1,5 +1,5 @@ 
 config ARCH_QCOM
-	bool "Qualcomm Support" if ARCH_MULTI_V7
+	bool "Qualcomm Support" if (ARCH_MULTI_V7 || ARCH_MULTI_V7_LPAE)
 	select ARCH_REQUIRE_GPIOLIB
 	select ARM_GIC
 	select CLKSRC_OF
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 0f92ba8..c2a1fce 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -2,7 +2,7 @@  config ARCH_SHMOBILE
 	bool
 
 config ARCH_SHMOBILE_MULTI
-	bool "Renesas ARM SoCs" if ARCH_MULTI_V7
+	bool "Renesas ARM SoCs" if (ARCH_MULTI_V7 || ARCH_MULTI_V7_LPAE)
 	depends on MMU
 	select ARCH_SHMOBILE
 	select HAVE_ARM_SCU if SMP
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 92d660f..12e1b49 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -1,5 +1,5 @@ 
 config ARCH_TEGRA
-	bool "NVIDIA Tegra" if ARCH_MULTI_V7
+	bool "NVIDIA Tegra" if (ARCH_MULTI_V7 || ARCH_MULTI_V7_LPAE)
 	select ARCH_HAS_CPUFREQ
 	select ARCH_REQUIRE_GPIOLIB
 	select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index 657d52d..a1d69d1 100644
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -1,5 +1,5 @@ 
 config ARCH_VEXPRESS
-	bool "ARM Ltd. Versatile Express family" if ARCH_MULTI_V7
+	bool "ARM Ltd. Versatile Express family" if (ARCH_MULTI_V7 || ARCH_MULTI_V7_LPAE)
 	select ARCH_REQUIRE_GPIOLIB
 	select ARCH_SUPPORTS_BIG_ENDIAN
 	select ARM_AMBA