GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <patrick@coreboot.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79180
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Patrick Georgi 2023-11-20 18:07:18 +01:00
parent 7eab8ef8b7
commit 54cec70650
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/kconfig/confdata.c
View File

@ -1269,10 +1269,12 @@ static void (*conf_changed_callback)(void);
void conf_set_changed(bool val) void conf_set_changed(bool val)
{ {
if (conf_changed_callback && conf_changed != val) bool changed = conf_changed != val;
conf_changed_callback();
conf_changed = val; conf_changed = val;
if (conf_changed_callback && changed)
conf_changed_callback();
} }
bool conf_get_changed(void) bool conf_get_changed(void)

25
util/kconfig/merge_config.sh
View File

@ -29,6 +29,7 @@ usage() {
echo " -y make builtin have precedence over modules" echo " -y make builtin have precedence over modules"
echo " -O dir to put generated output files. Consider setting \$KCONFIG_CONFIG instead." 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 " -s strict mode. Fail if the fragment redefines any value."
echo " -Q disable warning messages for overridden options."
echo echo
echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with \$CONFIG_ environment variable." echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with \$CONFIG_ environment variable."
} }
@ -40,6 +41,7 @@ BUILTIN=false
OUTPUT=. OUTPUT=.
STRICT=false STRICT=false
CONFIG_PREFIX=${CONFIG_-CONFIG_} CONFIG_PREFIX=${CONFIG_-CONFIG_}
WARNOVERRIDE=echo
while true; do while true; do
case $1 in case $1 in
@ -82,6 +84,11 @@ while true; do
shift shift
continue continue
;; ;;
"-Q")
WARNOVERRIDE=true
shift
continue
;;
*) *)
break break
;; ;;
@ -138,21 +145,21 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do
NEW_VAL=$(grep -w $CFG $MERGE_FILE) NEW_VAL=$(grep -w $CFG $MERGE_FILE)
BUILTIN_FLAG=false BUILTIN_FLAG=false
if [ "$BUILTIN" = "true" ] && [ "${NEW_VAL#CONFIG_*=}" = "m" ] && [ "${PREV_VAL#CONFIG_*=}" = "y" ]; then if [ "$BUILTIN" = "true" ] && [ "${NEW_VAL#CONFIG_*=}" = "m" ] && [ "${PREV_VAL#CONFIG_*=}" = "y" ]; then
echo Previous value: $PREV_VAL ${WARNOVERRIDE} Previous value: $PREV_VAL
echo New value: $NEW_VAL ${WARNOVERRIDE} New value: $NEW_VAL
echo -y passed, will not demote y to m ${WARNOVERRIDE} -y passed, will not demote y to m
echo ${WARNOVERRIDE}
BUILTIN_FLAG=true BUILTIN_FLAG=true
elif [ "x$PREV_VAL" != "x$NEW_VAL" ] ; then elif [ "x$PREV_VAL" != "x$NEW_VAL" ] ; then
echo Value of $CFG is redefined by fragment $ORIG_MERGE_FILE: ${WARNOVERRIDE} Value of $CFG is redefined by fragment $ORIG_MERGE_FILE:
echo Previous value: $PREV_VAL ${WARNOVERRIDE} Previous value: $PREV_VAL
echo New value: $NEW_VAL ${WARNOVERRIDE} New value: $NEW_VAL
echo ${WARNOVERRIDE}
if [ "$STRICT" = "true" ]; then if [ "$STRICT" = "true" ]; then
STRICT_MODE_VIOLATED=true STRICT_MODE_VIOLATED=true
fi fi
elif [ "$WARNREDUN" = "true" ]; then 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 fi
if [ "$BUILTIN_FLAG" = "false" ]; then if [ "$BUILTIN_FLAG" = "false" ]; then
sed -i "/$CFG[ =]/d" $TMP_FILE sed -i "/$CFG[ =]/d" $TMP_FILE