WIP: merge_config

[platform/kernel/linux-starfive.git] / scripts / kconfig / merge_config.sh

diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index e5b4698..c6fd672 100755 (executable)
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -196,9 +196,13 @@ for CFG in $(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_CONFIG_EXP2" $TMP_FILE); do
        REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE)
        ACTUAL_VAL=$(grep -w -e "$CFG" "$KCONFIG_CONFIG" || true)
        if [ "x$REQUESTED_VAL" != "x$ACTUAL_VAL" ] ; then
-               echo "Value requested for $CFG not in final .config"
-               echo "Requested value:  $REQUESTED_VAL"
-               echo "Actual value:     $ACTUAL_VAL"
-               echo ""
+               if [ "x$REQUESTED_VAL" != "x$CFG=n" -o \
+                    \( "x$ACTUAL_VAL" != "x"  -a \
+                       "x$ACTUAL_VAL" != "x# $CFG is not set" \) ]; then
+                       echo "Value requested for $CFG not in final .config"
+                       echo "Requested value:  $REQUESTED_VAL"
+                       echo "Actual value:     $ACTUAL_VAL"
+                       echo ""
+               fi
        fi
 done