diff mbox

[1/2] ARM: npcm: add CONFIG_ARCH_MULTI_V7 dependency

Message ID 20180307162430.2664523-1-arnd@arndb.de (mailing list archive)
State New, archived
Headers show

Commit Message

Arnd Bergmann March 7, 2018, 4:24 p.m. UTC
The top-level CONFIG_ARCH_NPCM symbol is not guarded with a
dependency, and can be selected for builds of traditional
(non-multiplatform) builds as well, where it causes a build
failure:

arch/arm/boot/Makefile:17: arch/arm/mach-npcm//Makefile.boot: No such file or directory

This moves the dependency to avoid that particular condition.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 arch/arm/mach-npcm/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Brendan Higgins March 9, 2018, 2:08 a.m. UTC | #1
On Wed, Mar 7, 2018 at 8:24 AM Arnd Bergmann <arnd@arndb.de> wrote:

> The top-level CONFIG_ARCH_NPCM symbol is not guarded with a
> dependency, and can be selected for builds of traditional
> (non-multiplatform) builds as well, where it causes a build
> failure:

> arch/arm/boot/Makefile:17: arch/arm/mach-npcm//Makefile.boot: No such
file or directory

> This moves the dependency to avoid that particular condition.

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>   arch/arm/mach-npcm/Kconfig | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)

> diff --git a/arch/arm/mach-npcm/Kconfig b/arch/arm/mach-npcm/Kconfig
> index 6ff9df2636be..2bc6697c8d97 100644
> --- a/arch/arm/mach-npcm/Kconfig
> +++ b/arch/arm/mach-npcm/Kconfig
> @@ -1,5 +1,5 @@
>   menuconfig ARCH_NPCM
> -       bool "Nuvoton NPCM Architecture"
> +       bool "Nuvoton NPCM Architecture" if ARCH_MULTI_V7
>          select ARCH_REQUIRE_GPIOLIB
>          select USE_OF
>          select PINCTRL
> @@ -10,7 +10,7 @@ if ARCH_NPCM
>   comment "NPCM7XX CPU type"

>   config ARCH_NPCM750
> -       depends on ARCH_NPCM && ARCH_MULTI_V7
> +       depends on ARCH_NPCM
>          bool "Support for NPCM750 BMC CPU (Poleg)"
>          select CACHE_L2X0
>          select CPU_V7
> --
> 2.9.0


Reviewed-by: Brendan Higgins <brendanhiggins@google.com>

Thanks!
Tomer Maimon March 12, 2018, 1:28 p.m. UTC | #2
Hi Brendan,

According to the last mail I have with Arnd can you modify the Kconfig
as follow:

+menuconfig ARCH_NPCM
+       bool "Nuvoton NPCM Architecture"
+       depends on ARCH_MULTI_V7
+       select PINCTRL
+
+if ARCH_NPCM
+
+config ARCH_NPCM7XX
+       bool "Support for NPCM7xx BMC (Poleg)"
+       depends on ARCH_MULTI_V7
+       select PINCTRL_NPCM7XX
+       select NPCM7XX_TIMER
+       select ARCH_REQUIRE_GPIOLIB
+       select CACHE_L2X0
+       select ARM_GIC
+       select HAVE_ARM_TWD if SMP
+       select HAVE_ARM_SCU if SMP
+       select ARM_ERRATA_764369 if SMP
+       select ARM_ERRATA_720789
+       select ARM_ERRATA_754322
+       select ARM_ERRATA_794072
+       select PL310_ERRATA_588369
+       select PL310_ERRATA_727915
+       select MFD_SYSCON
+       help
+         General support for NPCM7xx BMC (Poleg).
+
+         Nuvoton NPCM7xx BMC based on the Cortex A9.
+
+endif

Thanks!

Tomer

On 9 March 2018 at 04:08, Brendan Higgins <brendanhiggins@google.com> wrote:
> On Wed, Mar 7, 2018 at 8:24 AM Arnd Bergmann <arnd@arndb.de> wrote:
>
>> The top-level CONFIG_ARCH_NPCM symbol is not guarded with a
>> dependency, and can be selected for builds of traditional
>> (non-multiplatform) builds as well, where it causes a build
>> failure:
>
>> arch/arm/boot/Makefile:17: arch/arm/mach-npcm//Makefile.boot: No such
> file or directory
>
>> This moves the dependency to avoid that particular condition.
>
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> ---
>>   arch/arm/mach-npcm/Kconfig | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>
>> diff --git a/arch/arm/mach-npcm/Kconfig b/arch/arm/mach-npcm/Kconfig
>> index 6ff9df2636be..2bc6697c8d97 100644
>> --- a/arch/arm/mach-npcm/Kconfig
>> +++ b/arch/arm/mach-npcm/Kconfig
>> @@ -1,5 +1,5 @@
>>   menuconfig ARCH_NPCM
>> -       bool "Nuvoton NPCM Architecture"
>> +       bool "Nuvoton NPCM Architecture" if ARCH_MULTI_V7
>>          select ARCH_REQUIRE_GPIOLIB
>>          select USE_OF
>>          select PINCTRL
>> @@ -10,7 +10,7 @@ if ARCH_NPCM
>>   comment "NPCM7XX CPU type"
>
>>   config ARCH_NPCM750
>> -       depends on ARCH_NPCM && ARCH_MULTI_V7
>> +       depends on ARCH_NPCM
>>          bool "Support for NPCM750 BMC CPU (Poleg)"
>>          select CACHE_L2X0
>>          select CPU_V7
>> --
>> 2.9.0
>
>
> Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
>
> Thanks!
diff mbox

Patch

diff --git a/arch/arm/mach-npcm/Kconfig b/arch/arm/mach-npcm/Kconfig
index 6ff9df2636be..2bc6697c8d97 100644
--- a/arch/arm/mach-npcm/Kconfig
+++ b/arch/arm/mach-npcm/Kconfig
@@ -1,5 +1,5 @@ 
 menuconfig ARCH_NPCM
-	bool "Nuvoton NPCM Architecture"
+	bool "Nuvoton NPCM Architecture" if ARCH_MULTI_V7
 	select ARCH_REQUIRE_GPIOLIB
 	select USE_OF
 	select PINCTRL
@@ -10,7 +10,7 @@  if ARCH_NPCM
 comment "NPCM7XX CPU type"
 
 config ARCH_NPCM750
-	depends on ARCH_NPCM && ARCH_MULTI_V7
+	depends on ARCH_NPCM
 	bool "Support for NPCM750 BMC CPU (Poleg)"
 	select CACHE_L2X0
 	select CPU_V7