diff options
| -rwxr-xr-x | scripts/kconfig/merge_config.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 56584b107bf8..ec8e20350a64 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh | |||
| @@ -35,7 +35,7 @@ usage() { | |||
| 35 | echo " -O dir to put generated output files" | 35 | echo " -O dir to put generated output files" |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | MAKE=true | 38 | RUNMAKE=true |
| 39 | ALLTARGET=alldefconfig | 39 | ALLTARGET=alldefconfig |
| 40 | WARNREDUN=false | 40 | WARNREDUN=false |
| 41 | OUTPUT=. | 41 | OUTPUT=. |
| @@ -48,7 +48,7 @@ while true; do | |||
| 48 | continue | 48 | continue |
| 49 | ;; | 49 | ;; |
| 50 | "-m") | 50 | "-m") |
| 51 | MAKE=false | 51 | RUNMAKE=false |
| 52 | shift | 52 | shift |
| 53 | continue | 53 | continue |
| 54 | ;; | 54 | ;; |
| @@ -119,7 +119,7 @@ for MERGE_FILE in $MERGE_LIST ; do | |||
| 119 | cat $MERGE_FILE >> $TMP_FILE | 119 | cat $MERGE_FILE >> $TMP_FILE |
| 120 | done | 120 | done |
| 121 | 121 | ||
| 122 | if [ "$MAKE" = "false" ]; then | 122 | if [ "$RUNMAKE" = "false" ]; then |
| 123 | cp $TMP_FILE $OUTPUT/.config | 123 | cp $TMP_FILE $OUTPUT/.config |
| 124 | echo "#" | 124 | echo "#" |
| 125 | echo "# merged configuration written to $OUTPUT/.config (needs make)" | 125 | echo "# merged configuration written to $OUTPUT/.config (needs make)" |
