aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/kconfig')
-rw-r--r--scripts/kconfig/merge_config.sh6
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
59done 59done
60 60
61 61INITFILE=$1
62shift;
62 63
63MERGE_LIST=$* 64MERGE_LIST=$*
64SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p" 65SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p"
65TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX) 66TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
66 67
68echo "Using $INITFILE as base"
69cat $INITFILE > $TMP_FILE
70
67# Merge files, printing warnings on overrided values 71# Merge files, printing warnings on overrided values
68for MERGE_FILE in $MERGE_LIST ; do 72for MERGE_FILE in $MERGE_LIST ; do
69 echo "Merging $MERGE_FILE" 73 echo "Merging $MERGE_FILE"