| Message ID | 1423770163-583064-4-git-send-email-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
2015-02-12 11:42 GMT-08:00 Arnd Bergmann <arnd@arndb.de>: > A recent cleanup rearranged the Kconfig file for mach-bcm and > accidentally dropped the dependency on ARCH_MULTI_V7, which > makes it possible to now build the two mobile SoC platforms > on an ARMv6-only kernel, resulting in a log of Kconfig > warnings like > > warning: ARCH_BCM_MOBILE selects ARM_ERRATA_775420 which has unmet direct dependencies (CPU_V7) > > and which of course cannot work on any machine. > > This puts back the dependencies as before. Since both of these Kconfig options also select ARCH_BCM_MOBILE, you could put the select there instead? > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Fixes: 64e74aa788f99 ("ARM: mach-bcm: ARCH_BCM_MOBILE: remove one level of menu from Kconfig") > Cc: Florian Fainelli <f.fainelli@gmail.com> > Cc: Christian Daudt <bcm@fixthebug.org> > Cc: Scott Branden <sbranden@broadcom.com> > --- > arch/arm/mach-bcm/Kconfig | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig > index aaeec78c3ec4..8b11f44bb36e 100644 > --- a/arch/arm/mach-bcm/Kconfig > +++ b/arch/arm/mach-bcm/Kconfig > @@ -68,7 +68,7 @@ config ARCH_BCM_MOBILE > This enables support for systems based on Broadcom mobile SoCs. > > config ARCH_BCM_281XX > - bool "Broadcom BCM281XX SoC family" > + bool "Broadcom BCM281XX SoC family" if ARCH_MULTI_V7 > select ARCH_BCM_MOBILE > select HAVE_SMP > help > @@ -77,7 +77,7 @@ config ARCH_BCM_281XX > variants. > > config ARCH_BCM_21664 > - bool "Broadcom BCM21664 SoC family" > + bool "Broadcom BCM21664 SoC family" if ARCH_MULTI_V7 > select ARCH_BCM_MOBILE > select HAVE_SMP > help > -- > 2.1.0.rc2 >
> Florian Fainelli <f.fainelli@gmail.com> hat am 12. Februar 2015 um 21:02 > geschrieben: > 2015-02-12 11:42 GMT-08:00 Arnd Bergmann <arnd@arndb.de>: > > A recent cleanup rearranged the Kconfig file for mach-bcm and > > accidentally dropped the dependency on ARCH_MULTI_V7, which > > makes it possible to now build the two mobile SoC platforms > > on an ARMv6-only kernel, resulting in a log of Kconfig > > warnings like > > > > warning: ARCH_BCM_MOBILE selects ARM_ERRATA_775420 which has unmet direct > > dependencies (CPU_V7) > > > > and which of course cannot work on any machine. > > > > This puts back the dependencies as before. > > Since both of these Kconfig options also select ARCH_BCM_MOBILE, you > could put the select there instead? No, that would only work with 'select', but we need 'depends on' here. Arnd
2015-02-12 11:42 GMT-08:00 Arnd Bergmann <arnd@arndb.de>: > A recent cleanup rearranged the Kconfig file for mach-bcm and > accidentally dropped the dependency on ARCH_MULTI_V7, which > makes it possible to now build the two mobile SoC platforms > on an ARMv6-only kernel, resulting in a log of Kconfig > warnings like > > warning: ARCH_BCM_MOBILE selects ARM_ERRATA_775420 which has unmet direct dependencies (CPU_V7) > > and which of course cannot work on any machine. > > This puts back the dependencies as before. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Fixes: 64e74aa788f99 ("ARM: mach-bcm: ARCH_BCM_MOBILE: remove one level of menu from Kconfig") > Cc: Florian Fainelli <f.fainelli@gmail.com> > Cc: Christian Daudt <bcm@fixthebug.org> > Cc: Scott Branden <sbranden@broadcom.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com> > --- > arch/arm/mach-bcm/Kconfig | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig > index aaeec78c3ec4..8b11f44bb36e 100644 > --- a/arch/arm/mach-bcm/Kconfig > +++ b/arch/arm/mach-bcm/Kconfig > @@ -68,7 +68,7 @@ config ARCH_BCM_MOBILE > This enables support for systems based on Broadcom mobile SoCs. > > config ARCH_BCM_281XX > - bool "Broadcom BCM281XX SoC family" > + bool "Broadcom BCM281XX SoC family" if ARCH_MULTI_V7 > select ARCH_BCM_MOBILE > select HAVE_SMP > help > @@ -77,7 +77,7 @@ config ARCH_BCM_281XX > variants. > > config ARCH_BCM_21664 > - bool "Broadcom BCM21664 SoC family" > + bool "Broadcom BCM21664 SoC family" if ARCH_MULTI_V7 > select ARCH_BCM_MOBILE > select HAVE_SMP > help > -- > 2.1.0.rc2 >
On 15-02-12 01:57 PM, Florian Fainelli wrote: > 2015-02-12 11:42 GMT-08:00 Arnd Bergmann <arnd@arndb.de>: >> A recent cleanup rearranged the Kconfig file for mach-bcm and >> accidentally dropped the dependency on ARCH_MULTI_V7, which >> makes it possible to now build the two mobile SoC platforms >> on an ARMv6-only kernel, resulting in a log of Kconfig >> warnings like >> >> warning: ARCH_BCM_MOBILE selects ARM_ERRATA_775420 which has unmet direct dependencies (CPU_V7) >> >> and which of course cannot work on any machine. >> >> This puts back the dependencies as before. >> >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> >> Fixes: 64e74aa788f99 ("ARM: mach-bcm: ARCH_BCM_MOBILE: remove one level of menu from Kconfig") >> Cc: Florian Fainelli <f.fainelli@gmail.com> >> Cc: Christian Daudt <bcm@fixthebug.org> >> Cc: Scott Branden <sbranden@broadcom.com> > > Acked-by: Florian Fainelli <f.fainelli@gmail.com> Acked-by: Scott Branden <sbranden@broadcom.com> > >> --- >> arch/arm/mach-bcm/Kconfig | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig >> index aaeec78c3ec4..8b11f44bb36e 100644 >> --- a/arch/arm/mach-bcm/Kconfig >> +++ b/arch/arm/mach-bcm/Kconfig >> @@ -68,7 +68,7 @@ config ARCH_BCM_MOBILE >> This enables support for systems based on Broadcom mobile SoCs. >> >> config ARCH_BCM_281XX >> - bool "Broadcom BCM281XX SoC family" >> + bool "Broadcom BCM281XX SoC family" if ARCH_MULTI_V7 >> select ARCH_BCM_MOBILE >> select HAVE_SMP >> help >> @@ -77,7 +77,7 @@ config ARCH_BCM_281XX >> variants. >> >> config ARCH_BCM_21664 >> - bool "Broadcom BCM21664 SoC family" >> + bool "Broadcom BCM21664 SoC family" if ARCH_MULTI_V7 >> select ARCH_BCM_MOBILE >> select HAVE_SMP >> help >> -- >> 2.1.0.rc2 >> > > >
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index aaeec78c3ec4..8b11f44bb36e 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -68,7 +68,7 @@ config ARCH_BCM_MOBILE This enables support for systems based on Broadcom mobile SoCs. config ARCH_BCM_281XX - bool "Broadcom BCM281XX SoC family" + bool "Broadcom BCM281XX SoC family" if ARCH_MULTI_V7 select ARCH_BCM_MOBILE select HAVE_SMP help @@ -77,7 +77,7 @@ config ARCH_BCM_281XX variants. config ARCH_BCM_21664 - bool "Broadcom BCM21664 SoC family" + bool "Broadcom BCM21664 SoC family" if ARCH_MULTI_V7 select ARCH_BCM_MOBILE select HAVE_SMP help
A recent cleanup rearranged the Kconfig file for mach-bcm and accidentally dropped the dependency on ARCH_MULTI_V7, which makes it possible to now build the two mobile SoC platforms on an ARMv6-only kernel, resulting in a log of Kconfig warnings like warning: ARCH_BCM_MOBILE selects ARM_ERRATA_775420 which has unmet direct dependencies (CPU_V7) and which of course cannot work on any machine. This puts back the dependencies as before. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: 64e74aa788f99 ("ARM: mach-bcm: ARCH_BCM_MOBILE: remove one level of menu from Kconfig") Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: Christian Daudt <bcm@fixthebug.org> Cc: Scott Branden <sbranden@broadcom.com> --- arch/arm/mach-bcm/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)