[coreboot-gerrit] [S] Change in coreboot[main]: util/kconfig: Uprev to Linux 6.3's kconfig

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/79180?usp=email )

Change subject: util/kconfig: Uprev to Linux 6.3's kconfig
......................................................................

util/kconfig: Uprev to Linux 6.3's kconfig

Minor bugfix, plus stuff that doesn't really affect us.

TEST=`util/abuild/abuild -C` output (config.h and config.build) remains
the same

Change-Id: I0af0c2ae4cb11bb58457830ffcd8bb8c2422a3d1
Signed-off-by: Patrick Georgi 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79180
Reviewed-by: Martin L Roth 
Tested-by: build bot (Jenkins) 
---
M util/kconfig/confdata.c
M util/kconfig/merge_config.sh
2 files changed, 20 insertions(+), 11 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Martin L Roth: Looks good to me, approved

diff --git a/util/kconfig/confdata.c b/util/kconfig/confdata.c
index 726a96e..b5c6da3 100644
--- a/util/kconfig/confdata.c
+++ b/util/kconfig/confdata.c
@@ -1269,10 +1269,12 @@

void conf_set_changed(bool val)
 {
-	if (conf_changed_callback && conf_changed != val)
-		conf_changed_callback();
+	bool changed = conf_changed != val;

conf_changed = val;
+
+	if (conf_changed_callback && changed)
+		conf_changed_callback();
 }

bool conf_get_changed(void)
diff --git a/util/kconfig/merge_config.sh b/util/kconfig/merge_config.sh
index e5b4698..902eb42 100755
--- a/util/kconfig/merge_config.sh
+++ b/util/kconfig/merge_config.sh
@@ -29,6 +29,7 @@
    echo "  -y    make builtin have precedence over modules"
    echo "  -O    dir to put generated output files.  Consider setting $KCONFIG_CONFIG instead."
    echo "  -s    strict mode. Fail if the fragment redefines any value."
+	echo "  -Q    disable warning messages for overridden options."
    echo
    echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with $CONFIG_ environment variable."
 }
@@ -40,6 +41,7 @@
 OUTPUT=.
 STRICT=false
 CONFIG_PREFIX=${CONFIG_-CONFIG_}
+WARNOVERRIDE=echo

while true; do
    case $1 in
@@ -82,6 +84,11 @@
    	shift
    	continue
    	;;
+	"-Q")
+		WARNOVERRIDE=true
+		shift
+		continue
+		;;
    *)
    	break
    	;;
@@ -138,21 +145,21 @@
    	NEW_VAL=$(grep -w $CFG $MERGE_FILE)
    	BUILTIN_FLAG=false
    	if [ "$BUILTIN" = "true" ] && [ "${NEW_VAL#CONFIG_*=}" = "m" ] && [ "${PREV_VAL#CONFIG_*=}" = "y" ]; then
-			echo Previous  value: $PREV_VAL
-			echo New value:       $NEW_VAL
-			echo -y passed, will not demote y to m
-			echo
+			${WARNOVERRIDE} Previous  value: $PREV_VAL
+			${WARNOVERRIDE} New value:       $NEW_VAL
+			${WARNOVERRIDE} -y passed, will not demote y to m
+			${WARNOVERRIDE}
    		BUILTIN_FLAG=true
    	elif [ "x$PREV_VAL" != "x$NEW_VAL" ] ; then
-			echo Value of $CFG is redefined by fragment $ORIG_MERGE_FILE:
-			echo Previous  value: $PREV_VAL
-			echo New value:       $NEW_VAL
-			echo
+			${WARNOVERRIDE} Value of $CFG is redefined by fragment $ORIG_MERGE_FILE:
+			${WARNOVERRIDE} Previous  value: $PREV_VAL
+			${WARNOVERRIDE} New value:       $NEW_VAL
+			${WARNOVERRIDE}
    		if [ "$STRICT" = "true" ]; then
    			STRICT_MODE_VIOLATED=true
    		fi
    	elif [ "$WARNREDUN" = "true" ]; then
-			echo Value of $CFG is redundant by fragment $ORIG_MERGE_FILE:
+			${WARNOVERRIDE} Value of $CFG is redundant by fragment $ORIG_MERGE_FILE:
    	fi
    	if [ "$BUILTIN_FLAG" = "false" ]; then
    		sed -i "/$CFG[ =]/d" $TMP_FILE