diff options
| author | Patrick Georgi <patrick@coreboot.org> | 2023-11-20 18:12:45 +0100 |
|---|---|---|
| committer | Patrick Georgi <patrick@coreboot.org> | 2023-11-24 16:50:27 +0000 |
| commit | 0a48cfa3a59fcacf170ad05d57ea2bd33d44c7c3 (patch) | |
| tree | 59e11880956edc1ea04d20e9238a97bc3252adf4 /util | |
| parent | 34b149b508f0555b7ea7847711603e0980131331 (diff) | |
| download | coreboot-0a48cfa3a59fcacf170ad05d57ea2bd33d44c7c3.tar.gz coreboot-0a48cfa3a59fcacf170ad05d57ea2bd33d44c7c3.tar.bz2 coreboot-0a48cfa3a59fcacf170ad05d57ea2bd33d44c7c3.zip | |
util/kconfig: Uprev to Linux 6.5's kconfig
TEST=`util/abuild/abuild -C` output (config.h and config.build) remains
the same
Change-Id: If717d064d87b0045f276a4ee963db0a62230f5d8
Signed-off-by: Patrick Georgi <patrick@coreboot.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79182
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Diffstat (limited to 'util')
| -rw-r--r-- | util/kconfig/gconf.c | 11 | ||||
| -rwxr-xr-x | util/kconfig/streamline_config.pl | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/util/kconfig/gconf.c b/util/kconfig/gconf.c index 17adabfd6e6b..9709aca3a30f 100644 --- a/util/kconfig/gconf.c +++ b/util/kconfig/gconf.c @@ -636,7 +636,7 @@ void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data) { GtkWidget *dialog; const gchar *intro_text = - "Welcome to gkc, the GTK+ graphical configuration tool\n" + "Welcome to gconfig, the GTK+ graphical configuration tool.\n" "For each option, a blank box indicates the feature is disabled, a\n" "check indicates it is enabled, and a dot indicates that it is to\n" "be compiled as a module. Clicking on the box will cycle through the three states.\n" @@ -647,10 +647,7 @@ void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data) "Although there is no cross reference yet to help you figure out\n" "what other options must be enabled to support the option you\n" "are interested in, you can still view the help of a grayed-out\n" - "option.\n" - "\n" - "Toggling Show Debug Info under the Options menu will show \n" - "the dependencies, which you can then match by examining other options."; + "option."; dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -667,7 +664,7 @@ void on_about1_activate(GtkMenuItem * menuitem, gpointer user_data) { GtkWidget *dialog; const gchar *about_text = - "gkc is copyright (c) 2002 Romain Lievin <roms@lpg.ticalc.org>.\n" + "gconfig is copyright (c) 2002 Romain Lievin <roms@lpg.ticalc.org>.\n" "Based on the source code from Roman Zippel.\n"; dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd), @@ -685,7 +682,7 @@ void on_license1_activate(GtkMenuItem * menuitem, gpointer user_data) { GtkWidget *dialog; const gchar *license_text = - "gkc is released under the terms of the GNU GPL v2.\n" + "gconfig is released under the terms of the GNU GPL v2.\n" "For more information, please see the source code or\n" "visit http://www.fsf.org/licenses/licenses.html\n"; diff --git a/util/kconfig/streamline_config.pl b/util/kconfig/streamline_config.pl index 3387ad7508f7..d51cd7ac15d2 100755 --- a/util/kconfig/streamline_config.pl +++ b/util/kconfig/streamline_config.pl @@ -317,7 +317,7 @@ foreach my $makefile (@makefiles) { $_ = convert_vars($_, %make_vars); # collect objects after obj-$(CONFIG_FOO_BAR) - if (/obj-\$\((CONFIG_[^\)]*)\)\s*[+:]?=\s*(.*)/) { + if (/obj-\$[({](CONFIG_[^})]*)[)}]\s*[+:]?=\s*(.*)/) { $var = $1; $objs = $2; |