Skip to content

Commit b1b3f49

Browse files
author
Russell King
committed
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>
1 parent 4f1cd91 commit b1b3f49

File tree

39 files changed

+765
-767
lines changed

39 files changed

+765
-767
lines changed

‎arch/arm/Kconfig

Lines changed: 201 additions & 202 deletions
Large diffs are not rendered by default.

‎arch/arm/common/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
config ARM_GIC
2+
bool
23
select IRQ_DOMAIN
34
select MULTI_IRQ_HANDLER
4-
bool
55

66
config GIC_NON_BANKED
77
bool
88

99
config ARM_VIC
10+
bool
1011
select IRQ_DOMAIN
1112
select MULTI_IRQ_HANDLER
12-
bool
1313

1414
config ARM_VIC_NR
1515
int

‎arch/arm/mach-at91/Kconfig

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,75 +19,75 @@ config AT91_SAM9G45_RESET
1919

2020
config SOC_AT91SAM9
2121
bool
22-
select GENERIC_CLOCKEVENTS
2322
select CPU_ARM926T
23+
select GENERIC_CLOCKEVENTS
2424

2525
menu "Atmel AT91 System-on-Chip"
2626

2727
comment "Atmel AT91 Processor"
2828

2929
config SOC_AT91SAM9
3030
bool
31+
select AT91_SAM9_SMC
32+
select AT91_SAM9_TIME
3133
select CPU_ARM926T
3234
select MULTI_IRQ_HANDLER
3335
select SPARSE_IRQ
34-
select AT91_SAM9_TIME
35-
select AT91_SAM9_SMC
3636

3737
config SOC_AT91RM9200
3838
bool "AT91RM9200"
3939
select CPU_ARM920T
40-
select MULTI_IRQ_HANDLER
41-
select SPARSE_IRQ
4240
select GENERIC_CLOCKEVENTS
4341
select HAVE_AT91_DBGU0
42+
select MULTI_IRQ_HANDLER
43+
select SPARSE_IRQ
4444

4545
config SOC_AT91SAM9260
4646
bool "AT91SAM9260, AT91SAM9XE or AT91SAM9G20"
47-
select SOC_AT91SAM9
4847
select HAVE_AT91_DBGU0
4948
select HAVE_NET_MACB
49+
select SOC_AT91SAM9
5050
help
5151
Select this if you are using one of Atmel's AT91SAM9260, AT91SAM9XE
5252
or AT91SAM9G20 SoC.
5353

5454
config SOC_AT91SAM9261
5555
bool "AT91SAM9261 or AT91SAM9G10"
56-
select SOC_AT91SAM9
5756
select HAVE_AT91_DBGU0
5857
select HAVE_FB_ATMEL
58+
select SOC_AT91SAM9
5959
help
6060
Select this if you are using one of Atmel's AT91SAM9261 or AT91SAM9G10 SoC.
6161

6262
config SOC_AT91SAM9263
6363
bool "AT91SAM9263"
64-
select SOC_AT91SAM9
6564
select HAVE_AT91_DBGU1
6665
select HAVE_FB_ATMEL
6766
select HAVE_NET_MACB
67+
select SOC_AT91SAM9
6868

6969
config SOC_AT91SAM9RL
7070
bool "AT91SAM9RL"
71-
select SOC_AT91SAM9
7271
select HAVE_AT91_DBGU0
7372
select HAVE_FB_ATMEL
73+
select SOC_AT91SAM9
7474

7575
config SOC_AT91SAM9G45
7676
bool "AT91SAM9G45 or AT91SAM9M10 families"
77-
select SOC_AT91SAM9
7877
select HAVE_AT91_DBGU1
7978
select HAVE_FB_ATMEL
8079
select HAVE_NET_MACB
80+
select SOC_AT91SAM9
8181
help
8282
Select this if you are using one of Atmel's AT91SAM9G45 family SoC.
8383
This support covers AT91SAM9G45, AT91SAM9G46, AT91SAM9M10 and AT91SAM9M11.
8484

8585
config SOC_AT91SAM9X5
8686
bool "AT91SAM9x5 family"
87-
select SOC_AT91SAM9
8887
select HAVE_AT91_DBGU0
8988
select HAVE_FB_ATMEL
9089
select HAVE_NET_MACB
90+
select SOC_AT91SAM9
9191
help
9292
Select this if you are using one of Atmel's AT91SAM9x5 family SoC.
9393
This means that your SAM9 name finishes with a '5' (except if it is
@@ -97,9 +97,9 @@ config SOC_AT91SAM9X5
9797

9898
config SOC_AT91SAM9N12
9999
bool "AT91SAM9N12 family"
100-
select SOC_AT91SAM9
101100
select HAVE_AT91_DBGU0
102101
select HAVE_FB_ATMEL
102+
select SOC_AT91SAM9
103103
help
104104
Select this if you are using Atmel's AT91SAM9N12 SoC.
105105

@@ -144,9 +144,9 @@ config ARCH_AT91SAM9G45
144144
config ARCH_AT91X40
145145
bool "AT91x40"
146146
depends on !MMU
147+
select ARCH_USES_GETTIMEOFFSET
147148
select MULTI_IRQ_HANDLER
148149
select SPARSE_IRQ
149-
select ARCH_USES_GETTIMEOFFSET
150150

151151
endchoice
152152

‎arch/arm/mach-clps711x/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ config ARCH_CLEP7312
2323

2424
config ARCH_EDB7211
2525
bool "EDB7211"
26-
select ISA
27-
select ARCH_SPARSEMEM_ENABLE
2826
select ARCH_SELECT_MEMORY_MODEL
27+
select ARCH_SPARSEMEM_ENABLE
28+
select ISA
2929
help
3030
Say Y here if you intend to run this kernel on a Cirrus Logic EDB-7211
3131
evaluation board.

‎arch/arm/mach-davinci/Kconfig

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ config AINTC
44
bool
55

66
config CP_INTC
7-
select IRQ_DOMAIN
87
bool
8+
select IRQ_DOMAIN
99

1010
config ARCH_DAVINCI_DMx
11-
select CPU_ARM926T
1211
bool
12+
select CPU_ARM926T
1313

1414
menu "TI DaVinci Implementations"
1515

@@ -32,29 +32,29 @@ config ARCH_DAVINCI_DM646x
3232

3333
config ARCH_DAVINCI_DA830
3434
bool "DA830/OMAP-L137/AM17x based system"
35-
select CP_INTC
3635
select ARCH_DAVINCI_DA8XX
3736
select CPU_DCACHE_WRITETHROUGH # needed on silicon revs 1.0, 1.1
37+
select CP_INTC
3838

3939
config ARCH_DAVINCI_DA850
4040
bool "DA850/OMAP-L138/AM18x based system"
41-
select CP_INTC
4241
select ARCH_DAVINCI_DA8XX
4342
select ARCH_HAS_CPUFREQ
43+
select CP_INTC
4444

4545
config ARCH_DAVINCI_DA8XX
46-
select CPU_ARM926T
4746
bool
47+
select CPU_ARM926T
4848

4949
config ARCH_DAVINCI_DM365
5050
bool "DaVinci 365 based system"
5151
select AINTC
5252
select ARCH_DAVINCI_DMx
5353

5454
config ARCH_DAVINCI_TNETV107X
55+
bool "TNETV107X based system"
5556
select CPU_V6
5657
select CP_INTC
57-
bool "TNETV107X based system"
5858

5959
comment "DaVinci Board Type"
6060

@@ -103,9 +103,9 @@ config MACH_DAVINCI_DM6467_EVM
103103
bool "TI DM6467 EVM"
104104
default ARCH_DAVINCI_DM646x
105105
depends on ARCH_DAVINCI_DM646x
106-
select MACH_DAVINCI_DM6467TEVM
107106
select EEPROM_AT24
108107
select I2C
108+
select MACH_DAVINCI_DM6467TEVM
109109
help
110110
Configure this option to specify the whether the board used
111111
for development is a DM6467 EVM
@@ -127,8 +127,8 @@ config MACH_DAVINCI_DA830_EVM
127127
bool "TI DA830/OMAP-L137/AM17x Reference Platform"
128128
default ARCH_DAVINCI_DA830
129129
depends on ARCH_DAVINCI_DA830
130-
select GPIO_PCF857X
131130
select EEPROM_AT24
131+
select GPIO_PCF857X
132132
select I2C
133133
help
134134
Say Y here to select the TI DA830/OMAP-L137/AM17x Evaluation Module.

0 commit comments

Comments
 (0)