Re: [PATCH 1/2] ARM: config: sort select statements alphanumerically
On Fri, Oct 12, 2012 at 11:09 PM, Tony Lindgren t...@atomide.com wrote: * Russell King - ARM Linux li...@arm.linux.org.uk [121012 07:44]: On Fri, Oct 12, 2012 at 04:04:28PM +0200, Linus Walleij wrote: On Fri, Oct 12, 2012 at 3:26 PM, Russell King rmk+ker...@arm.linux.org.uk wrote: 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: I applied this and tried to configure the Nomadik defconfig, and I get this, sadly: Yes, I've just fixed those. Unfortunately, the patch is soo large that it trips the mailing list size limit, and has to be manually approved, so I'm not sure I can call on the list maintainers again today to do the approval thing. After applying these two patches and manually running: $ git checkout-index -f arch/arm/mach-pxa/Kconfig $ git checkout-index -f arch/arm/mach-footbridge/Kconfig Tony, why pxa and footbridge here? It builds just fine for omaps, so for omaps: Acked-by: Tony Lindgren t...@atomide.com ___ Davinci-linux-open-source mailing list Davinci-linux-open-source@linux.davincidsp.com http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
Re: [PATCH 1/2] ARM: config: sort select statements alphanumerically
On 10/12/2012 08:48 AM, Russell King - ARM Linux wrote:
On Fri, Oct 12, 2012 at 03:41:20PM +0100, Russell King - ARM Linux wrote:
On Fri, Oct 12, 2012 at 04:04:28PM +0200, Linus Walleij wrote:
On Fri, Oct 12, 2012 at 3:26 PM, Russell King
rmk+ker...@arm.linux.org.uk wrote:
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:
I applied this and tried to configure the Nomadik defconfig,
and I get this, sadly:
Yes, I've just fixed those. Unfortunately, the patch is soo large that
it trips the mailing list size limit, and has to be manually approved,
so I'm not sure I can call on the list maintainers again today to do the
approval thing.
Instead, here's the updated script:
8===
#!/usr/bin/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};
}
}
8===
Run it like this (assuming its saved as sort.pl):
for f in $(find arch/arm -name 'Kconfig*'); do perl sort.pl $f $f.new \
mv $f.new $f git update-index $f; done
Omit the git update-index bit if you don't want to commit the result.
(git update-index is safer than git add for this as git add will
add new files, git update-index won't without an additional option.
That's not a recommendation to use it though.)
FYI, I Tegra works fine after running this script. I guess you can
consider that an ack for the script output;
Acked-by: Stephen Warren swar...@nvidia.com
___
Davinci-linux-open-source mailing list
Davinci-linux-open-source@linux.davincidsp.com
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
Re: [PATCH 1/2] ARM: config: sort select statements alphanumerically
On Fri, Oct 12, 2012 at 02:26:19PM +0100, Russell King wrote:
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/)) {
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.
Signed-off-by: Russell King rmk+ker...@arm.linux.org.uk
For ARCH_DOVE, ARCH_KIRKWOOD, ARCH_MV78XX0, ARCH_ORION5X, PLAT_ORION,
and PLAT_ORION_LEGACY:
Acked-by: Jason Cooper ja...@lakedaemon.net
thx,
Jason.
___
Davinci-linux-open-source mailing list
Davinci-linux-open-source@linux.davincidsp.com
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
Re: [PATCH 1/2] ARM: config: sort select statements alphanumerically
On Fri, Oct 12, 2012 at 8:18 PM, Russell King - ARM Linux li...@arm.linux.org.uk wrote: Instead, here's the updated script: Tested build and boot on DA850 and DM365. For the DaVinci changes: Acked-by: Sekhar Nori nsek...@ti.com Thanks, Sekhar ___ Davinci-linux-open-source mailing list Davinci-linux-open-source@linux.davincidsp.com http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
Re: [PATCH 1/2] ARM: config: sort select statements alphanumerically
On Fri, Oct 12, 2012 at 3:26 PM, Russell King rmk+ker...@arm.linux.org.uk wrote: 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: I applied this and tried to configure the Nomadik defconfig, and I get this, sadly: make -f Makefile ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- KBUILD_OUTPUT=/var/linus/linux/build-nomadik nhk8815_defconfig make[1]: Entering directory `/var/linus/linux' GEN /var/linus/linux/build-nomadik/Makefile arch/arm/mach-footbridge/Kconfig:29: syntax error arch/arm/mach-footbridge/Kconfig:28: unknown option Saying arch/arm/mach-footbridge/Kconfig:31: syntax error arch/arm/mach-footbridge/Kconfig:30: unknown option The arch/arm/mach-footbridge/Kconfig:31: unknown option There arch/arm/mach-footbridge/Kconfig:32: unknown option prototypes arch/arm/mach-footbridge/Kconfig:35: syntax error arch/arm/mach-footbridge/Kconfig:34: unknown option http arch/arm/mach-footbridge/Kconfig:37: syntax error arch/arm/mach-footbridge/Kconfig:36: unknown option If arch/arm/mach-footbridge/Kconfig:37: unknown option Server arch/arm/mach-pxa/Kconfig:18: syntax error arch/arm/mach-pxa/Kconfig:3: missing end statement for this entry arch/arm/mach-pxa/Kconfig:3: missing end statement for this entry arch/arm/Kconfig:245: missing end statement for this entry arch/arm/mach-pxa/Kconfig:17: invalid statement arch/arm/mach-pxa/Kconfig:632: unexpected end statement arch/arm/mach-pxa/Kconfig:634: syntax error arch/arm/mach-pxa/Kconfig:633: unexpected option select arch/arm/mach-pxa/Kconfig:634: unexpected option select arch/arm/mach-pxa/Kconfig:733: unexpected end statement arch/arm/Kconfig:1416: unexpected end statement make[3]: *** [nhk8815_defconfig] Error 1 make[2]: *** [nhk8815_defconfig] Error 2 make[1]: *** [sub-make] Error 2 make[1]: Leaving directory `/var/linus/linux' make: *** [config-base] Error 2make -f Makefile ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- KBUILD_OUTPUT=/var/linus/linux/build-nomadik nhk8815_defconfig make[1]: Entering directory `/var/linus/linux' GEN /var/linus/linux/build-nomadik/Makefile arch/arm/mach-footbridge/Kconfig:29: syntax error arch/arm/mach-footbridge/Kconfig:28: unknown option Saying arch/arm/mach-footbridge/Kconfig:31: syntax error arch/arm/mach-footbridge/Kconfig:30: unknown option The arch/arm/mach-footbridge/Kconfig:31: unknown option There arch/arm/mach-footbridge/Kconfig:32: unknown option prototypes arch/arm/mach-footbridge/Kconfig:35: syntax error arch/arm/mach-footbridge/Kconfig:34: unknown option http arch/arm/mach-footbridge/Kconfig:37: syntax error arch/arm/mach-footbridge/Kconfig:36: unknown option If arch/arm/mach-footbridge/Kconfig:37: unknown option Server arch/arm/mach-pxa/Kconfig:18: syntax error arch/arm/mach-pxa/Kconfig:3: missing end statement for this entry arch/arm/mach-pxa/Kconfig:3: missing end statement for this entry arch/arm/Kconfig:245: missing end statement for this entry arch/arm/mach-pxa/Kconfig:17: invalid statement arch/arm/mach-pxa/Kconfig:632: unexpected end statement arch/arm/mach-pxa/Kconfig:634: syntax error arch/arm/mach-pxa/Kconfig:633: unexpected option select arch/arm/mach-pxa/Kconfig:634: unexpected option select arch/arm/mach-pxa/Kconfig:733: unexpected end statement arch/arm/Kconfig:1416: unexpected end statement make[3]: *** [nhk8815_defconfig] Error 1 make[2]: *** [nhk8815_defconfig] Error 2 make[1]: *** [sub-make] Error 2 make[1]: Leaving directory `/var/linus/linux' make: *** [config-base] Error 2 Yours, Linus Walleij ___ Davinci-linux-open-source mailing list Davinci-linux-open-source@linux.davincidsp.com http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
Re: [PATCH 1/2] ARM: config: sort select statements alphanumerically
On Fri, Oct 12, 2012 at 04:04:28PM +0200, Linus Walleij wrote: On Fri, Oct 12, 2012 at 3:26 PM, Russell King rmk+ker...@arm.linux.org.uk wrote: 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: I applied this and tried to configure the Nomadik defconfig, and I get this, sadly: Yes, I've just fixed those. Unfortunately, the patch is soo large that it trips the mailing list size limit, and has to be manually approved, so I'm not sure I can call on the list maintainers again today to do the approval thing. ___ Davinci-linux-open-source mailing list Davinci-linux-open-source@linux.davincidsp.com http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
Re: [PATCH 1/2] ARM: config: sort select statements alphanumerically
On Fri, Oct 12, 2012 at 03:41:20PM +0100, Russell King - ARM Linux wrote:
On Fri, Oct 12, 2012 at 04:04:28PM +0200, Linus Walleij wrote:
On Fri, Oct 12, 2012 at 3:26 PM, Russell King
rmk+ker...@arm.linux.org.uk wrote:
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:
I applied this and tried to configure the Nomadik defconfig,
and I get this, sadly:
Yes, I've just fixed those. Unfortunately, the patch is soo large that
it trips the mailing list size limit, and has to be manually approved,
so I'm not sure I can call on the list maintainers again today to do the
approval thing.
Instead, here's the updated script:
8===
#!/usr/bin/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};
}
}
8===
Run it like this (assuming its saved as sort.pl):
for f in $(find arch/arm -name 'Kconfig*'); do perl sort.pl $f $f.new \
mv $f.new $f git update-index $f; done
Omit the git update-index bit if you don't want to commit the result.
(git update-index is safer than git add for this as git add will
add new files, git update-index won't without an additional option.
That's not a recommendation to use it though.)
___
Davinci-linux-open-source mailing list
Davinci-linux-open-source@linux.davincidsp.com
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
Re: [PATCH 1/2] ARM: config: sort select statements alphanumerically
* Russell King - ARM Linux li...@arm.linux.org.uk [121012 07:44]: On Fri, Oct 12, 2012 at 04:04:28PM +0200, Linus Walleij wrote: On Fri, Oct 12, 2012 at 3:26 PM, Russell King rmk+ker...@arm.linux.org.uk wrote: 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: I applied this and tried to configure the Nomadik defconfig, and I get this, sadly: Yes, I've just fixed those. Unfortunately, the patch is soo large that it trips the mailing list size limit, and has to be manually approved, so I'm not sure I can call on the list maintainers again today to do the approval thing. After applying these two patches and manually running: $ git checkout-index -f arch/arm/mach-pxa/Kconfig $ git checkout-index -f arch/arm/mach-footbridge/Kconfig It builds just fine for omaps, so for omaps: Acked-by: Tony Lindgren t...@atomide.com ___ Davinci-linux-open-source mailing list Davinci-linux-open-source@linux.davincidsp.com http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
Re: [PATCH 1/2] ARM: config: sort select statements alphanumerically
On Fri, Oct 12, 2012 at 4:48 PM, Russell King - ARM Linux li...@arm.linux.org.uk wrote: Instead, here's the updated script: Works like a charm, the result compiles and boots nicely. Acked-by: Linus Walleij linus.wall...@linaro.org Yours, Linus Walleij ___ Davinci-linux-open-source mailing list Davinci-linux-open-source@linux.davincidsp.com http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
