Commit 22d550ae authored by Arnaud Lacombe's avatar Arnaud Lacombe

kconfig/streamline_config.pl: use options to determine operating mode

The options introduced are --localmodconfig (default) and --localyesconfig.
They match the Makefile target behavior.

Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarArnaud Lacombe <lacombar@gmail.com>
parent f597a718
...@@ -35,7 +35,7 @@ silentoldconfig: $(obj)/conf ...@@ -35,7 +35,7 @@ silentoldconfig: $(obj)/conf
localmodconfig: $(obj)/streamline_config.pl $(obj)/conf localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
$(Q)mkdir -p include/generated $(Q)mkdir -p include/generated
$(Q)perl $< $(srctree) $(Kconfig) > .tmp.config $(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config
$(Q)if [ -f .config ]; then \ $(Q)if [ -f .config ]; then \
cmp -s .tmp.config .config || \ cmp -s .tmp.config .config || \
(mv -f .config .config.old.1; \ (mv -f .config .config.old.1; \
...@@ -50,7 +50,7 @@ localmodconfig: $(obj)/streamline_config.pl $(obj)/conf ...@@ -50,7 +50,7 @@ localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
localyesconfig: $(obj)/streamline_config.pl $(obj)/conf localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
$(Q)mkdir -p include/generated $(Q)mkdir -p include/generated
$(Q)perl $< $(srctree) $(Kconfig) > .tmp.config $(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config
$(Q)sed -i s/=m/=y/ .tmp.config $(Q)sed -i s/=m/=y/ .tmp.config
$(Q)if [ -f .config ]; then \ $(Q)if [ -f .config ]; then \
cmp -s .tmp.config .config || \ cmp -s .tmp.config .config || \
......
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
# make oldconfig # make oldconfig
# #
use strict; use strict;
use Getopt::Long;
my $config = ".config"; my $config = ".config";
...@@ -112,6 +113,13 @@ sub find_config { ...@@ -112,6 +113,13 @@ sub find_config {
find_config; find_config;
# Parse options
my $localmodconfig = 0;
my $localyesconfig = 0;
GetOptions("localmodconfig" => \$localmodconfig,
"localyesconfig" => \$localyesconfig);
# Get the build source and top level Kconfig file (passed in) # Get the build source and top level Kconfig file (passed in)
my $ksource = $ARGV[0]; my $ksource = $ARGV[0];
my $kconfig = $ARGV[1]; my $kconfig = $ARGV[1];
...@@ -425,7 +433,11 @@ while(<CIN>) { ...@@ -425,7 +433,11 @@ while(<CIN>) {
if (/^(CONFIG.*)=(m|y)/) { if (/^(CONFIG.*)=(m|y)/) {
if (defined($configs{$1})) { if (defined($configs{$1})) {
$setconfigs{$1} = $2; if ($localyesconfig) {
$setconfigs{$1} = 'y';
} else {
$setconfigs{$1} = $2;
}
} elsif ($2 eq "m") { } elsif ($2 eq "m") {
print "# $1 is not set\n"; print "# $1 is not set\n";
next; next;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment