b1b3f49ce4
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>
45 lines
808 B
Text
45 lines
808 B
Text
#
|
|
# SPEAr Platform configuration file
|
|
#
|
|
|
|
if PLAT_SPEAR
|
|
|
|
choice
|
|
prompt "ST SPEAr Family"
|
|
default ARCH_SPEAR3XX
|
|
|
|
config ARCH_SPEAR13XX
|
|
bool "ST SPEAr13xx with Device Tree"
|
|
select ARM_GIC
|
|
select CPU_V7
|
|
select HAVE_SMP
|
|
select MIGHT_HAVE_CACHE_L2X0
|
|
select PINCTRL
|
|
select USE_OF
|
|
help
|
|
Supports for ARM's SPEAR13XX family
|
|
|
|
config ARCH_SPEAR3XX
|
|
bool "ST SPEAr3xx with Device Tree"
|
|
select ARM_VIC
|
|
select CPU_ARM926T
|
|
select PINCTRL
|
|
select USE_OF
|
|
help
|
|
Supports for ARM's SPEAR3XX family
|
|
|
|
config ARCH_SPEAR6XX
|
|
bool "SPEAr6XX"
|
|
select ARM_VIC
|
|
select CPU_ARM926T
|
|
help
|
|
Supports for ARM's SPEAR6XX family
|
|
|
|
endchoice
|
|
|
|
# Adding SPEAr machine specific configuration files
|
|
source "arch/arm/mach-spear13xx/Kconfig"
|
|
source "arch/arm/mach-spear3xx/Kconfig"
|
|
source "arch/arm/mach-spear6xx/Kconfig"
|
|
|
|
endif
|