2014-06-10 22:06:10 +08:00
|
|
|
menuconfig ARCH_BERLIN
|
ARM: use "depends on" for SoC configs instead of "if" after prompt
Many ARM sub-architectures use prompts followed by "if" conditional,
but it is wrong.
Please notice the difference between
config ARCH_FOO
bool "Foo SoCs" if ARCH_MULTI_V7
and
config ARCH_FOO
bool "Foo SoCs"
depends on ARCH_MULTI_V7
These two are *not* equivalent!
In the former statement, it is not ARCH_FOO, but its prompt that
depends on ARCH_MULTI_V7. So, it is completely valid that ARCH_FOO
is selected by another, but ARCH_MULTI_V7 is still disabled. As it is
not unmet dependency, Kconfig never warns. This is probably not what
you want.
The former should be used only when you need to do so, and you really
understand what you are doing. (In most cases, it should be wrong!)
For enabling/disabling sub-architectures, the latter is always correct.
As a good side effect, this commit fixes some entries over 80 columns
(mach-imx, mach-integrator, mach-mbevu).
[Arnd: I note that there is not really a bug here, according to
the discussion that followed, but I can see value in being consistent
and in making the lines shorter]
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Acked-by: Liviu Dudau <Liviu.Dudau@arm.com>
Acked-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: Jun Nie <jun.nie@linaro.org>
Acked-by: Matthias Brugger <matthias.bgg@gmail.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Acked-by: Shawn Guo <shawnguo@kernel.org>
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Acked-by: Krzysztof Halasa <khc@piap.pl>
Acked-by: Maxime Coquelin <maxime.coquelin@st.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2015-11-16 11:06:10 +08:00
|
|
|
bool "Marvell Berlin SoCs"
|
|
|
|
|
depends on ARCH_MULTI_V7
|
2014-09-03 15:48:22 +08:00
|
|
|
select ARCH_HAS_RESET_CONTROLLER
|
2013-09-09 20:36:19 +08:00
|
|
|
select ARM_GIC
|
|
|
|
|
select DW_APB_ICTL
|
|
|
|
|
select DW_APB_TIMER_OF
|
2014-09-03 15:48:22 +08:00
|
|
|
select GENERIC_IRQ_CHIP
|
2016-06-02 20:10:16 +08:00
|
|
|
select GPIOLIB
|
2015-04-28 03:40:35 +08:00
|
|
|
select MFD_SYSCON
|
2014-05-19 02:06:32 +08:00
|
|
|
select PINCTRL
|
2013-09-09 20:36:19 +08:00
|
|
|
|
|
|
|
|
if ARCH_BERLIN
|
|
|
|
|
|
|
|
|
|
config MACH_BERLIN_BG2
|
|
|
|
|
bool "Marvell Armada 1500 (BG2)"
|
|
|
|
|
select CACHE_L2X0
|
|
|
|
|
select CPU_PJ4B
|
2014-06-05 00:03:42 +08:00
|
|
|
select HAVE_ARM_SCU if SMP
|
2013-09-09 20:36:19 +08:00
|
|
|
select HAVE_ARM_TWD if SMP
|
2014-06-05 00:03:42 +08:00
|
|
|
select HAVE_SMP
|
2014-05-19 02:06:32 +08:00
|
|
|
select PINCTRL_BERLIN_BG2
|
2013-09-09 20:36:19 +08:00
|
|
|
|
|
|
|
|
config MACH_BERLIN_BG2CD
|
|
|
|
|
bool "Marvell Armada 1500-mini (BG2CD)"
|
|
|
|
|
select CACHE_L2X0
|
|
|
|
|
select HAVE_ARM_TWD if SMP
|
2014-05-19 02:06:32 +08:00
|
|
|
select PINCTRL_BERLIN_BG2CD
|
2013-09-09 20:36:19 +08:00
|
|
|
|
2014-03-22 03:39:16 +08:00
|
|
|
config MACH_BERLIN_BG2Q
|
|
|
|
|
bool "Marvell Armada 1500 Pro (BG2-Q)"
|
|
|
|
|
select CACHE_L2X0
|
2014-06-05 00:03:42 +08:00
|
|
|
select HAVE_ARM_SCU if SMP
|
2014-03-22 03:39:16 +08:00
|
|
|
select HAVE_ARM_TWD if SMP
|
2014-05-19 02:06:32 +08:00
|
|
|
select PINCTRL_BERLIN_BG2Q
|
2014-03-22 03:39:16 +08:00
|
|
|
|
2013-09-09 20:36:19 +08:00
|
|
|
endif
|