mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 00:48:50 +00:00
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>
175 lines
4.5 KiB
Text
175 lines
4.5 KiB
Text
if ARCH_OMAP1
|
|
|
|
menu "TI OMAP1 specific features"
|
|
|
|
comment "OMAP Core Type"
|
|
depends on ARCH_OMAP1
|
|
|
|
config ARCH_OMAP730
|
|
depends on ARCH_OMAP1
|
|
bool "OMAP730 Based System"
|
|
select ARCH_OMAP_OTG
|
|
select CPU_ARM926T
|
|
select OMAP_MPU_TIMER
|
|
|
|
config ARCH_OMAP850
|
|
depends on ARCH_OMAP1
|
|
bool "OMAP850 Based System"
|
|
select ARCH_OMAP_OTG
|
|
select CPU_ARM926T
|
|
|
|
config ARCH_OMAP15XX
|
|
depends on ARCH_OMAP1
|
|
default y
|
|
bool "OMAP15xx Based System"
|
|
select CPU_ARM925T
|
|
select OMAP_MPU_TIMER
|
|
|
|
config ARCH_OMAP16XX
|
|
depends on ARCH_OMAP1
|
|
bool "OMAP16xx Based System"
|
|
select ARCH_OMAP_OTG
|
|
select CPU_ARM926T
|
|
|
|
comment "OMAP Board Type"
|
|
depends on ARCH_OMAP1
|
|
|
|
config MACH_OMAP_INNOVATOR
|
|
bool "TI Innovator"
|
|
depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX)
|
|
help
|
|
TI OMAP 1510 or 1610 Innovator board support. Say Y here if you
|
|
have such a board.
|
|
|
|
config MACH_OMAP_H2
|
|
bool "TI H2 Support"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP16XX
|
|
help
|
|
TI OMAP 1610/1611B H2 board support. Say Y here if you have such
|
|
a board.
|
|
|
|
config MACH_OMAP_H3
|
|
bool "TI H3 Support"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP16XX
|
|
help
|
|
TI OMAP 1710 H3 board support. Say Y here if you have such
|
|
a board.
|
|
|
|
config MACH_OMAP_HTCWIZARD
|
|
bool "HTC Wizard"
|
|
depends on ARCH_OMAP850
|
|
help
|
|
HTC Wizard smartphone support (AKA QTEK 9100, ...)
|
|
|
|
config MACH_HERALD
|
|
bool "HTC Herald"
|
|
depends on ARCH_OMAP850
|
|
help
|
|
HTC Herald smartphone support (AKA T-Mobile Wing, ...)
|
|
|
|
config MACH_OMAP_OSK
|
|
bool "TI OSK Support"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP16XX
|
|
help
|
|
TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
|
|
if you have such a board.
|
|
|
|
config OMAP_OSK_MISTRAL
|
|
bool "Mistral QVGA board Support"
|
|
depends on MACH_OMAP_OSK
|
|
help
|
|
The OSK supports an optional add-on board with a Quarter-VGA
|
|
touchscreen, PDA-ish buttons, a resume button, bicolor LED,
|
|
and camera connector. Say Y here if you have this board.
|
|
|
|
config MACH_OMAP_PERSEUS2
|
|
bool "TI Perseus2"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP730
|
|
help
|
|
Support for TI OMAP 730 Perseus2 board. Say Y here if you have such
|
|
a board.
|
|
|
|
config MACH_OMAP_FSAMPLE
|
|
bool "TI F-Sample"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP730
|
|
help
|
|
Support for TI OMAP 850 F-Sample board. Say Y here if you have such
|
|
a board.
|
|
|
|
config MACH_VOICEBLUE
|
|
bool "Voiceblue"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP15XX
|
|
help
|
|
Support for Voiceblue GSM/VoIP gateway. Say Y here if you have
|
|
such a board.
|
|
|
|
config MACH_OMAP_PALMTE
|
|
bool "Palm Tungsten E"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP15XX
|
|
help
|
|
Support for the Palm Tungsten E PDA. To boot the kernel, you'll
|
|
need a PalmOS compatible bootloader; check out
|
|
http://palmtelinux.sourceforge.net/ for more information.
|
|
Say Y here if you have this PDA model, say N otherwise.
|
|
|
|
config MACH_OMAP_PALMZ71
|
|
bool "Palm Zire71"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP15XX
|
|
help
|
|
Support for the Palm Zire71 PDA. To boot the kernel,
|
|
you'll need a PalmOS compatible bootloader; check out
|
|
http://hackndev.com/palm/z71 for more information.
|
|
Say Y here if you have such a PDA, say N otherwise.
|
|
|
|
config MACH_OMAP_PALMTT
|
|
bool "Palm Tungsten|T"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP15XX
|
|
help
|
|
Support for the Palm Tungsten|T PDA. To boot the kernel, you'll
|
|
need a PalmOS compatible bootloader (Garux); check out
|
|
http://garux.sourceforge.net/ for more information.
|
|
Say Y here if you have this PDA model, say N otherwise.
|
|
|
|
config MACH_SX1
|
|
bool "Siemens SX1"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP15XX
|
|
select I2C
|
|
help
|
|
Support for the Siemens SX1 phone. To boot the kernel,
|
|
you'll need a SX1 compatible bootloader; check out
|
|
http://forum.oslik.ru and
|
|
http://www.handhelds.org/moin/moin.cgi/SiemensSX1
|
|
for more information.
|
|
Say Y here if you have such a phone, say NO otherwise.
|
|
|
|
config MACH_NOKIA770
|
|
bool "Nokia 770"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP16XX
|
|
help
|
|
Support for the Nokia 770 Internet Tablet. Say Y here if you
|
|
have such a device.
|
|
|
|
config MACH_AMS_DELTA
|
|
bool "Amstrad E3 (Delta)"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP15XX
|
|
select FIQ
|
|
select GPIO_GENERIC_PLATFORM
|
|
select LEDS_GPIO_REGISTER
|
|
select REGULATOR
|
|
select REGULATOR_FIXED_VOLTAGE
|
|
help
|
|
Support for the Amstrad E3 (codename Delta) videophone. Say Y here
|
|
if you have such a device.
|
|
|
|
config MACH_OMAP_GENERIC
|
|
bool "Generic OMAP board"
|
|
depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX)
|
|
help
|
|
Support for generic OMAP-1510, 1610 or 1710 board with
|
|
no FPGA. Can be used as template for porting Linux to
|
|
custom OMAP boards. Say Y here if you have a custom
|
|
board.
|
|
|
|
endmenu
|
|
|
|
endif
|