Change in coreboot[master]: util/kconfig: Uprev to Linux 5.15's kconfig

[Patrick Georgi (Code Review)]

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/58792 )

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

util/kconfig: Uprev to Linux 5.15's kconfig

Upstream's changes only affect a script that we don't use.
Still, this keeps us in sync with the official version.

Change-Id: I39cbbfb8dc816b4f36f92e6bd53f40c733691242
Signed-off-by: Patrick Georgi 
---
M util/kconfig/merge_config.sh
1 file changed, 15 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/58792/1

diff --git a/util/kconfig/merge_config.sh b/util/kconfig/merge_config.sh
index 63c8565..e5b4698 100755
--- a/util/kconfig/merge_config.sh
+++ b/util/kconfig/merge_config.sh
@@ -28,6 +28,7 @@
    echo "  -r    list redundant entries when merging fragments"
    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
    echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with $CONFIG_ environment variable."
 }
@@ -37,6 +38,7 @@
 WARNREDUN=false
 BUILTIN=false
 OUTPUT=.
+STRICT=false
 CONFIG_PREFIX=${CONFIG_-CONFIG_}

while true; do
@@ -75,6 +77,11 @@
    	shift 2
    	continue
    	;;
+	"-s")
+		STRICT=true
+		shift
+		continue
+		;;
    *)
    	break
    	;;
@@ -141,6 +148,9 @@
    		echo Previous  value: $PREV_VAL
    		echo New value:       $NEW_VAL
    		echo
+			if [ "$STRICT" = "true" ]; then
+				STRICT_MODE_VIOLATED=true
+			fi
    	elif [ "$WARNREDUN" = "true" ]; then
    		echo Value of $CFG is redundant by fragment $ORIG_MERGE_FILE:
    	fi
@@ -153,6 +163,11 @@
    cat $MERGE_FILE >> $TMP_FILE
 done

+if [ "$STRICT_MODE_VIOLATED" = "true" ]; then
+	echo "The fragment redefined a value and strict mode had been passed."
+	exit 1
+fi
+
 if [ "$RUNMAKE" = "false" ]; then
    cp -T -- "$TMP_FILE" "$KCONFIG_CONFIG"
    echo "#"