diff options
| -rw-r--r-- | scripts/kconfig/Makefile | 4 | ||||
| -rw-r--r-- | scripts/kconfig/streamline_config.pl | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 6d69c7ccdcc7..80599e3a7994 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
| @@ -30,7 +30,7 @@ silentoldconfig: $(obj)/conf | |||
| 30 | $< -s $(Kconfig) | 30 | $< -s $(Kconfig) |
| 31 | 31 | ||
| 32 | localmodconfig: $(obj)/streamline_config.pl $(obj)/conf | 32 | localmodconfig: $(obj)/streamline_config.pl $(obj)/conf |
| 33 | $(Q)perl $< $(Kconfig) > .tmp.config | 33 | $(Q)perl $< $(srctree) $(Kconfig) > .tmp.config |
| 34 | $(Q)if [ -f .config ]; then \ | 34 | $(Q)if [ -f .config ]; then \ |
| 35 | cmp -s .tmp.config .config || \ | 35 | cmp -s .tmp.config .config || \ |
| 36 | (mv -f .config .config.old.1; \ | 36 | (mv -f .config .config.old.1; \ |
| @@ -44,7 +44,7 @@ localmodconfig: $(obj)/streamline_config.pl $(obj)/conf | |||
| 44 | $(Q)rm -f .tmp.config | 44 | $(Q)rm -f .tmp.config |
| 45 | 45 | ||
| 46 | localyesconfig: $(obj)/streamline_config.pl $(obj)/conf | 46 | localyesconfig: $(obj)/streamline_config.pl $(obj)/conf |
| 47 | $(Q)perl $< $(Kconfig) > .tmp.config | 47 | $(Q)perl $< $(srctree) $(Kconfig) > .tmp.config |
| 48 | $(Q)sed -i s/=m/=y/ .tmp.config | 48 | $(Q)sed -i s/=m/=y/ .tmp.config |
| 49 | $(Q)if [ -f .config ]; then \ | 49 | $(Q)if [ -f .config ]; then \ |
| 50 | cmp -s .tmp.config .config || \ | 50 | cmp -s .tmp.config .config || \ |
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl index 95984db8e1e0..0d800820c3cd 100644 --- a/scripts/kconfig/streamline_config.pl +++ b/scripts/kconfig/streamline_config.pl | |||
| @@ -43,7 +43,6 @@ | |||
| 43 | # make oldconfig | 43 | # make oldconfig |
| 44 | # | 44 | # |
| 45 | my $config = ".config"; | 45 | my $config = ".config"; |
| 46 | my $linuxpath = "."; | ||
| 47 | 46 | ||
| 48 | my $uname = `uname -r`; | 47 | my $uname = `uname -r`; |
| 49 | chomp $uname; | 48 | chomp $uname; |
| @@ -111,7 +110,11 @@ sub find_config { | |||
| 111 | 110 | ||
| 112 | find_config; | 111 | find_config; |
| 113 | 112 | ||
| 114 | my @makefiles = `find $linuxpath -name Makefile`; | 113 | # Get the build source and top level Kconfig file (passed in) |
| 114 | my $ksource = $ARGV[0]; | ||
| 115 | my $kconfig = $ARGV[1]; | ||
| 116 | |||
| 117 | my @makefiles = `find $ksource -name Makefile`; | ||
| 115 | my %depends; | 118 | my %depends; |
| 116 | my %selects; | 119 | my %selects; |
| 117 | my %prompts; | 120 | my %prompts; |
| @@ -119,9 +122,6 @@ my %objects; | |||
| 119 | my $var; | 122 | my $var; |
| 120 | my $cont = 0; | 123 | my $cont = 0; |
| 121 | 124 | ||
| 122 | # Get the top level Kconfig file (passed in) | ||
| 123 | my $kconfig = $ARGV[0]; | ||
| 124 | |||
| 125 | # prevent recursion | 125 | # prevent recursion |
| 126 | my %read_kconfigs; | 126 | my %read_kconfigs; |
| 127 | 127 | ||
| @@ -132,7 +132,7 @@ sub read_kconfig { | |||
| 132 | my $config; | 132 | my $config; |
| 133 | my @kconfigs; | 133 | my @kconfigs; |
| 134 | 134 | ||
| 135 | open(KIN, $kconfig) || die "Can't open $kconfig"; | 135 | open(KIN, "$ksource/$kconfig") || die "Can't open $kconfig"; |
| 136 | while (<KIN>) { | 136 | while (<KIN>) { |
| 137 | chomp; | 137 | chomp; |
| 138 | 138 | ||
