diff options
Diffstat (limited to 'scripts/kconfig')
-rw-r--r-- | scripts/kconfig/merge_config.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index ceadf0e150cf..23d738a1acda 100644 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh | |||
@@ -58,12 +58,16 @@ while true; do | |||
58 | esac | 58 | esac |
59 | done | 59 | done |
60 | 60 | ||
61 | 61 | INITFILE=$1 | |
62 | shift; | ||
62 | 63 | ||
63 | MERGE_LIST=$* | 64 | MERGE_LIST=$* |
64 | SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p" | 65 | SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p" |
65 | TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX) | 66 | TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX) |
66 | 67 | ||
68 | echo "Using $INITFILE as base" | ||
69 | cat $INITFILE > $TMP_FILE | ||
70 | |||
67 | # Merge files, printing warnings on overrided values | 71 | # Merge files, printing warnings on overrided values |
68 | for MERGE_FILE in $MERGE_LIST ; do | 72 | for MERGE_FILE in $MERGE_LIST ; do |
69 | echo "Merging $MERGE_FILE" | 73 | echo "Merging $MERGE_FILE" |