2014-06-10 22:06:10 +08:00
|
|
|
menuconfig ARCH_SIRF
|
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 "CSR SiRF"
|
|
|
|
|
depends on ARCH_MULTI_V7
|
2014-01-10 11:15:42 +08:00
|
|
|
select ARCH_HAS_RESET_CONTROLLER
|
2015-11-29 06:56:47 +08:00
|
|
|
select RESET_CONTROLLER
|
2013-03-20 00:45:37 +08:00
|
|
|
select GENERIC_IRQ_CHIP
|
2016-06-02 20:10:16 +08:00
|
|
|
select GPIOLIB
|
2014-04-08 06:39:19 +08:00
|
|
|
select NO_IOPORT_MAP
|
2015-04-14 19:55:55 +08:00
|
|
|
select REGMAP
|
2013-03-20 00:45:37 +08:00
|
|
|
select PINCTRL
|
|
|
|
|
select PINCTRL_SIRF
|
|
|
|
|
help
|
|
|
|
|
Support for CSR SiRFprimaII/Marco/Polo platforms
|
|
|
|
|
|
2012-08-23 13:41:58 +08:00
|
|
|
if ARCH_SIRF
|
|
|
|
|
|
2015-01-04 17:53:37 +08:00
|
|
|
comment "CSR SiRF atlas6/primaII/Atlas7 Specific Features"
|
2013-03-18 15:04:38 +08:00
|
|
|
|
|
|
|
|
config ARCH_ATLAS6
|
|
|
|
|
bool "CSR SiRFSoC ATLAS6 ARM Cortex A9 Platform"
|
|
|
|
|
default y
|
|
|
|
|
select SIRF_IRQ
|
|
|
|
|
help
|
|
|
|
|
Support for CSR SiRFSoC ARM Cortex A9 Platform
|
2012-08-23 13:41:58 +08:00
|
|
|
|
2015-01-04 17:53:37 +08:00
|
|
|
config ARCH_ATLAS7
|
|
|
|
|
bool "CSR SiRFSoC ATLAS7 ARM Cortex A7 Platform"
|
|
|
|
|
default y
|
|
|
|
|
select ARM_GIC
|
2016-06-03 19:11:39 +08:00
|
|
|
select ATLAS7_TIMER
|
2015-01-04 17:53:37 +08:00
|
|
|
select HAVE_ARM_SCU if SMP
|
|
|
|
|
select HAVE_SMP
|
|
|
|
|
help
|
|
|
|
|
Support for CSR SiRFSoC ARM Cortex A7 Platform
|
|
|
|
|
|
2012-08-23 13:41:58 +08:00
|
|
|
config ARCH_PRIMA2
|
|
|
|
|
bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"
|
|
|
|
|
default y
|
2012-08-23 13:41:59 +08:00
|
|
|
select SIRF_IRQ
|
ARM: config: sort select statements alphanumerically
As suggested by Andrew Morton:
This is a pet peeve of mine. Any time there's a long list of items
(header file inclusions, kconfig entries, array initalisers, etc) and
someone wants to add a new item, they *always* go and stick it at the
end of the list.
Guys, don't do this. Either put the new item into a randomly-chosen
position or, probably better, alphanumerically sort the list.
lets sort all our select statements alphanumerically. This commit was
created by the following perl:
while (<>) {
while (/\\\s*$/) {
$_ .= <>;
}
undef %selects if /^\s*config\s+/;
if (/^\s+select\s+(\w+).*/) {
if (defined($selects{$1})) {
if ($selects{$1} eq $_) {
print STDERR "Warning: removing duplicated $1 entry\n";
} else {
print STDERR "Error: $1 differently selected\n".
"\tOld: $selects{$1}\n".
"\tNew: $_\n";
exit 1;
}
}
$selects{$1} = $_;
next;
}
if (%selects and (/^\s*$/ or /^\s+help/ or /^\s+---help---/ or
/^endif/ or /^endchoice/)) {
foreach $k (sort (keys %selects)) {
print "$selects{$k}";
}
undef %selects;
}
print;
}
if (%selects) {
foreach $k (sort (keys %selects)) {
print "$selects{$k}";
}
}
It found two duplicates:
Warning: removing duplicated S5P_SETUP_MIPIPHY entry
Warning: removing duplicated HARDIRQS_SW_RESEND entry
and they are identical duplicates, hence the shrinkage in the diffstat
of two lines.
We have four testers reporting success of this change (Tony, Stephen,
Linus and Sekhar.)
Acked-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2012-10-07 00:12:25 +08:00
|
|
|
select ZONE_DMA
|
2016-06-03 20:28:38 +08:00
|
|
|
select PRIMA2_TIMER
|
2012-08-23 13:41:58 +08:00
|
|
|
help
|
|
|
|
|
Support for CSR SiRFSoC ARM Cortex A9 Platform
|
|
|
|
|
|
2012-08-23 13:41:59 +08:00
|
|
|
config SIRF_IRQ
|
|
|
|
|
bool
|
|
|
|
|
|
2012-08-23 13:41:58 +08:00
|
|
|
endif
|