diff options
author | Patrick Georgi <patrick@coreboot.org> | 2022-10-28 01:00:26 +0200 |
---|---|---|
committer | Patrick Georgi <patrick@coreboot.org> | 2022-10-30 08:47:21 +0000 |
commit | aa8796d3fd10ab52f2f6d3c7aa1684c72c08fc8c (patch) | |
tree | c720ee8c3a6e3dc81ab944be8d970a1c194f5702 /util | |
parent | 1215cc7632516b88958dd169c29da8476c694527 (diff) |
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>
Diffstat (limited to 'util')
-rw-r--r-- | util/kconfig/lkc.h | 1 | ||||
-rw-r--r-- | util/kconfig/menu.c | 5 | ||||
-rwxr-xr-x | util/kconfig/qconf-cfg.sh | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/util/kconfig/lkc.h b/util/kconfig/lkc.h index 657ce77667..68dc8475b8 100644 --- a/util/kconfig/lkc.h +++ b/util/kconfig/lkc.h @@ -102,7 +102,6 @@ bool menu_is_empty(struct menu *menu); 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 3d6f7cba88..62b6313f51 100644 --- a/util/kconfig/menu.c +++ b/util/kconfig/menu.c @@ -661,11 +661,6 @@ const char *menu_get_prompt(struct menu *menu) 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 9b695e5cd9..ad652cb539 100755 --- a/util/kconfig/qconf-cfg.sh +++ b/util/kconfig/qconf-cfg.sh @@ -20,5 +20,6 @@ fi 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 |