aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/merge_config.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 07bb8863577..ceadf0e150c 100644
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -104,8 +104,8 @@ make KCONFIG_ALLCONFIG=$TMP_FILE $ALLTARGET
104# Check all specified config values took (might have missed-dependency issues) 104# Check all specified config values took (might have missed-dependency issues)
105for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do 105for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do
106 106
107 REQUESTED_VAL=$(sed -n "$SED_CONFIG_EXP" $TMP_FILE | grep -w -e "$CFG") 107 REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE)
108 ACTUAL_VAL=$(sed -n "$SED_CONFIG_EXP" .config | grep -w -e "$CFG") 108 ACTUAL_VAL=$(grep -w -e "$CFG" .config)
109 if [ "x$REQUESTED_VAL" != "x$ACTUAL_VAL" ] ; then 109 if [ "x$REQUESTED_VAL" != "x$ACTUAL_VAL" ] ; then
110 echo "Value requested for $CFG not in final .config" 110 echo "Value requested for $CFG not in final .config"
111 echo "Requested value: $REQUESTED_VAL" 111 echo "Requested value: $REQUESTED_VAL"