| Message ID | 20180307162430.2664523-1-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] ARM: npcm: add CONFIG_ARCH_MULTI_V7 dependency | expand |
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!
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!
On Mon, Mar 12, 2018 at 2:28 PM, Tomer Maimon <tmaimon77@gmail.com> wrote: > 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 One more change is needed to avoid a link error without CONFIG_SMP: diff --git a/arch/arm/mach-npcm/Makefile b/arch/arm/mach-npcm/Makefile index c7a1316d27c1..34d51f9f207c 100644 --- a/arch/arm/mach-npcm/Makefile +++ b/arch/arm/mach-npcm/Makefile @@ -1,3 +1,4 @@ AFLAGS_headsmp.o += -march=armv7-a -obj-$(CONFIG_ARCH_NPCM750) += npcm7xx.o platsmp.o headsmp.o +obj-$(CONFIG_ARCH_NPCM750) += npcm7xx.o +obj-$(CONFIG_SMP) += platsmp.o headsmp.o Can one of you send me a pull request or the full patch series on top of the version I have in arm-soc? Arnd
Hi Arnd, I will send tomorrow new version with some modification we need to do once we use NPCM7XX and not NPCM750. Brendan, Is it O.K.? On 12 March 2018 at 15:37, Arnd Bergmann <arnd@arndb.de> wrote: > On Mon, Mar 12, 2018 at 2:28 PM, Tomer Maimon <tmaimon77@gmail.com> wrote: >> 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 > > One more change is needed to avoid a link error without CONFIG_SMP: > > diff --git a/arch/arm/mach-npcm/Makefile b/arch/arm/mach-npcm/Makefile > index c7a1316d27c1..34d51f9f207c 100644 > --- a/arch/arm/mach-npcm/Makefile > +++ b/arch/arm/mach-npcm/Makefile > @@ -1,3 +1,4 @@ > AFLAGS_headsmp.o += -march=armv7-a > > -obj-$(CONFIG_ARCH_NPCM750) += npcm7xx.o platsmp.o headsmp.o > +obj-$(CONFIG_ARCH_NPCM750) += npcm7xx.o > +obj-$(CONFIG_SMP) += platsmp.o headsmp.o > > Can one of you send me a pull request or the full patch series on top > of the version I have in arm-soc? > > Arnd
Hi Arnd, I sent now Full patch for the NPCM BMC's V12, Is it O.K.? or do you want me to send the same patch to ARM: npcm: drop extraneous 'select' statements as well? Thanks Tomer On 12 March 2018 at 17:15, Tomer Maimon <tmaimon77@gmail.com> wrote: > Hi Arnd, > > I will send tomorrow new version with some modification we need to do > once we use NPCM7XX and not NPCM750. > > Brendan, > > Is it O.K.? > > > > On 12 March 2018 at 15:37, Arnd Bergmann <arnd@arndb.de> wrote: >> On Mon, Mar 12, 2018 at 2:28 PM, Tomer Maimon <tmaimon77@gmail.com> wrote: >>> 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 >> >> One more change is needed to avoid a link error without CONFIG_SMP: >> >> diff --git a/arch/arm/mach-npcm/Makefile b/arch/arm/mach-npcm/Makefile >> index c7a1316d27c1..34d51f9f207c 100644 >> --- a/arch/arm/mach-npcm/Makefile >> +++ b/arch/arm/mach-npcm/Makefile >> @@ -1,3 +1,4 @@ >> AFLAGS_headsmp.o += -march=armv7-a >> >> -obj-$(CONFIG_ARCH_NPCM750) += npcm7xx.o platsmp.o headsmp.o >> +obj-$(CONFIG_ARCH_NPCM750) += npcm7xx.o >> +obj-$(CONFIG_SMP) += platsmp.o headsmp.o >> >> Can one of you send me a pull request or the full patch series on top >> of the version I have in arm-soc? >> >> Arnd
On Tue, Mar 13, 2018 at 2:35 PM, Tomer Maimon <tmaimon77@gmail.com> wrote: > Hi Arnd, > > I sent now Full patch for the NPCM BMC's V12, > > Is it O.K.? or do you want me to send the same patch to ARM: npcm: > drop extraneous 'select' statements as well? The patch series you just sent contains a new version of the patches I already applied. What I need instead is a patch series that does the changes on top, since I don't rebase the my next/* branches. Arnd
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
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(-) -- 2.9.0