Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/68915 )
Change subject: util/kconfig: Uprev to Linux 6.0's kconfig ......................................................................
util/kconfig: Uprev to Linux 6.0's kconfig
Only minor changes in kconfig this time that shouldn't affect us.
TEST=`util/abuild/abuild -C` output (build.h and build.conf) remains the same
Change-Id: I77cc8517128a973c345c41da2c483b78eeaee89f Signed-off-by: Patrick Georgi patrick@coreboot.org Reviewed-on: https://review.coreboot.org/c/coreboot/+/68915 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Elyes Haouas ehaouas@noos.fr --- M util/kconfig/lkc.h M util/kconfig/menu.c M util/kconfig/qconf-cfg.sh 3 files changed, 20 insertions(+), 6 deletions(-)
Approvals: build bot (Jenkins): Verified Elyes Haouas: Looks good to me, approved
diff --git a/util/kconfig/lkc.h b/util/kconfig/lkc.h index 657ce77..68dc847 100644 --- a/util/kconfig/lkc.h +++ b/util/kconfig/lkc.h @@ -102,7 +102,6 @@ bool menu_is_visible(struct menu *menu); bool menu_has_prompt(struct menu *menu); const char *menu_get_prompt(struct menu *menu); -struct menu *menu_get_root_menu(struct menu *menu); struct menu *menu_get_parent_menu(struct menu *menu); bool menu_has_help(struct menu *menu); const char *menu_get_help(struct menu *menu); diff --git a/util/kconfig/menu.c b/util/kconfig/menu.c index 3d6f7cb..62b6313 100644 --- a/util/kconfig/menu.c +++ b/util/kconfig/menu.c @@ -661,11 +661,6 @@ return NULL; }
-struct menu *menu_get_root_menu(struct menu *menu) -{ - return &rootmenu; -} - struct menu *menu_get_parent_menu(struct menu *menu) { enum prop_type type; diff --git a/util/kconfig/qconf-cfg.sh b/util/kconfig/qconf-cfg.sh index 9b695e5..ad652cb 100755 --- a/util/kconfig/qconf-cfg.sh +++ b/util/kconfig/qconf-cfg.sh @@ -20,5 +20,6 @@ echo >&2 "*" echo >&2 "* Could not find Qt5 via ${HOSTPKG_CONFIG}." echo >&2 "* Please install Qt5 and make sure it's in PKG_CONFIG_PATH" +echo >&2 "* You need $PKG" echo >&2 "*" exit 1