coreboot-gerrit November 2023

coreboot-gerrit@coreboot.org

1 participants
3037 discussions

[S] Change in coreboot[main]: acpi: Optimize enum acpi_tables layout
by Felix Singer (Code Review) 20 Nov '23

20 Nov '23

Attention is currently required from: Arthur Heymans, Martin L Roth, Naresh Solanki, Patrick Rudolph. Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/79099?usp=email ) Change subject: acpi: Optimize enum acpi_tables layout ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/79099?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I192339df771d6a3ae67358fe46334fe2b216b974 Gerrit-Change-Number: 79099 Gerrit-PatchSet: 2 Gerrit-Owner: Naresh Solanki <naresh.solanki(a)9elements.com> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com> Gerrit-Reviewer: Maximilian Brune <maximilian.brune(a)9elements.com> Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Martin L Roth <gaumless(a)gmail.com> Gerrit-Attention: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: Naresh Solanki <naresh.solanki(a)9elements.com> Gerrit-Comment-Date: Mon, 20 Nov 2023 22:09:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in coreboot[main]: acpi: Optimize enum acpi_tables layout
by Maximilian Brune (Code Review) 20 Nov '23

20 Nov '23

Attention is currently required from: Arthur Heymans, Martin L Roth, Naresh Solanki, Patrick Rudolph. Maximilian Brune has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/79099?usp=email ) Change subject: acpi: Optimize enum acpi_tables layout ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/79099?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I192339df771d6a3ae67358fe46334fe2b216b974 Gerrit-Change-Number: 79099 Gerrit-PatchSet: 2 Gerrit-Owner: Naresh Solanki <naresh.solanki(a)9elements.com> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com> Gerrit-Reviewer: Maximilian Brune <maximilian.brune(a)9elements.com> Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Martin L Roth <gaumless(a)gmail.com> Gerrit-Attention: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: Naresh Solanki <naresh.solanki(a)9elements.com> Gerrit-Comment-Date: Mon, 20 Nov 2023 21:33:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[XS] Change in coreboot[main]: mb/google/rex: Set EPP to 45%
by Bora Guvendik (Code Review) 20 Nov '23

20 Nov '23

Attention is currently required from: Dinesh Gehlot, Eran Mitrani, Kapil Porwal, Subrata Banik, Tarun. Bora Guvendik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/79204?usp=email ) Change subject: mb/google/rex: Set EPP to 45% ...................................................................... Patch Set 1: Code-Review-1 (1 comment) Patchset: PS1: Also a kernel patch is needed. Waiting for kernel patch to upstreamed. -- To view, visit https://review.coreboot.org/c/coreboot/+/79204?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Ia420e8b6bed252a8a1f59d36a4a71c2b8ec9524e Gerrit-Change-Number: 79204 Gerrit-PatchSet: 1 Gerrit-Owner: Bora Guvendik <bora.guvendik(a)intel.com> Gerrit-Reviewer: Bora Guvendik <bora.guvendik(a)intel.com> Gerrit-Reviewer: Dinesh Gehlot <digehlot(a)google.com> Gerrit-Reviewer: Eran Mitrani <mitrani(a)google.com> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: Tarun <tstuli(a)gmail.com> Gerrit-Attention: Eran Mitrani <mitrani(a)google.com> Gerrit-Attention: Subrata Banik <subratabanik(a)google.com> Gerrit-Attention: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Attention: Dinesh Gehlot <digehlot(a)google.com> Gerrit-Attention: Tarun <tstuli(a)gmail.com> Gerrit-Comment-Date: Mon, 20 Nov 2023 20:33:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[XS] Change in coreboot[main]: mb/google/rex: Set EPP to 45%
by Bora Guvendik (Code Review) 20 Nov '23

20 Nov '23

Bora Guvendik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/79204?usp=email ) Change subject: mb/google/rex: Set EPP to 45% ...................................................................... mb/google/rex: Set EPP to 45% This updates energy performance preference value to 45%. BUG=none TEST=Build and boot on google/rex Signed-off-by: Bora Guvendik <bora.guvendik(a)intel.com> Change-Id: Ia420e8b6bed252a8a1f59d36a4a71c2b8ec9524e --- M src/mainboard/google/rex/variants/baseboard/rex/devicetree.cb 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/79204/1 diff --git a/src/mainboard/google/rex/variants/baseboard/rex/devicetree.cb b/src/mainboard/google/rex/variants/baseboard/rex/devicetree.cb index 162bb64..e0846d8 100644 --- a/src/mainboard/google/rex/variants/baseboard/rex/devicetree.cb +++ b/src/mainboard/google/rex/variants/baseboard/rex/devicetree.cb @@ -62,6 +62,11 @@ register "sagv_freq_mhz[3]" = "6400" register "sagv_gear[3]" = "4" + # Set EPP to 45% + # 45 * 256/100 = 115 = 0x73 + register "enable_energy_perf_pref" = "true" + register "energy_perf_pref_value" = "0x73" + # Set on-board graphics as primary display register "skip_ext_gfx_scan" = "1" -- To view, visit https://review.coreboot.org/c/coreboot/+/79204?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Ia420e8b6bed252a8a1f59d36a4a71c2b8ec9524e Gerrit-Change-Number: 79204 Gerrit-PatchSet: 1 Gerrit-Owner: Bora Guvendik <bora.guvendik(a)intel.com> Gerrit-MessageType: newchange

1 0

[M] Change in coreboot[main]: mb/hp/280_g2: Make use of the chipset devicetree
by Felix Singer (Code Review) 20 Nov '23

20 Nov '23

Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/78595?usp=email ) Change subject: mb/hp/280_g2: Make use of the chipset devicetree ...................................................................... Patch Set 11: (1 comment) File src/mainboard/hp/280_g2/devicetree.cb: https://review.coreboot.org/c/coreboot/+/78595/comment/397e0220_3798f5f8 : PS11, Line 66: device ref pcie_rp5 on > The comments that mention which device is attached to each RP have been lost. Sorry for removing them. See CB:79153. -- To view, visit https://review.coreboot.org/c/coreboot/+/78595?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Ib6edae61fb904143c3b3994df812524a258fa9f3 Gerrit-Change-Number: 78595 Gerrit-PatchSet: 11 Gerrit-Owner: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-Reviewer: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: 9elements QA <hardwaretestrobot(a)gmail.com> Gerrit-Comment-Date: Mon, 20 Nov 2023 20:23:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: comment

1 0

[XS] Change in coreboot[main]: mb/hp/280_g2: Restore comments documenting root port devices
by Felix Singer (Code Review) 20 Nov '23

20 Nov '23

Attention is currently required from: Angel Pons. Hello Angel Pons, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/79153?usp=email to look at the new patch set (#2). Change subject: mb/hp/280_g2: Restore comments documenting root port devices ...................................................................... mb/hp/280_g2: Restore comments documenting root port devices While transitioning the devicetree to make it using the chipset devicetree, commit 3b5b9f4c543c ("mb/hp/280_g2: Make use of the chipset devicetree") removed useful comments documenting the endpoints of the root ports. Restore them. Change-Id: I178cb472a8f40baaccc30514689bda2730dfa9dc Signed-off-by: Felix Singer <felixsinger(a)posteo.net> --- M src/mainboard/hp/280_g2/devicetree.cb 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/53/79153/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/79153?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I178cb472a8f40baaccc30514689bda2730dfa9dc Gerrit-Change-Number: 79153 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newpatchset

1 0

[XS] Change in coreboot[main]: mb/hp/280_g2: Restore comments documenting root port devices
by Felix Singer (Code Review) 20 Nov '23

20 Nov '23

Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/79153?usp=email ) Change subject: mb/hp/280_g2: Restore comments documenting root port devices ...................................................................... mb/hp/280_g2: Restore comments documenting root port devices Change-Id: I178cb472a8f40baaccc30514689bda2730dfa9dc Signed-off-by: Felix Singer <felixsinger(a)posteo.net> --- M src/mainboard/hp/280_g2/devicetree.cb 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/53/79153/1 diff --git a/src/mainboard/hp/280_g2/devicetree.cb b/src/mainboard/hp/280_g2/devicetree.cb index d6c8bc0..3b25a42 100644 --- a/src/mainboard/hp/280_g2/devicetree.cb +++ b/src/mainboard/hp/280_g2/devicetree.cb @@ -64,12 +64,14 @@ end device ref uart2 on end device ref pcie_rp5 on + # IT8893E PCI Bridge register "PcieRpEnable[4]" = "1" register "PcieRpLtrEnable[4]" = "1" register "PcieRpAdvancedErrorReporting[4]" = "1" register "PcieRpClkSrcNumber[4]" = "11" end device ref pcie_rp6 on + # PCIe x1 slot register "PcieRpEnable[5]" = "1" register "PcieRpHotPlug[5]" = "1" register "PcieRpLtrEnable[5]" = "1" @@ -77,12 +79,14 @@ register "PcieRpClkSrcNumber[5]" = "6" end device ref pcie_rp7 on + # RTL8111 GbE NIC register "PcieRpEnable[6]" = "1" register "PcieRpLtrEnable[6]" = "1" register "PcieRpAdvancedErrorReporting[6]" = "1" register "PcieRpClkSrcNumber[6]" = "10" end device ref pcie_rp8 on + # M.2 2230 slot register "PcieRpEnable[7]" = "1" register "PcieRpHotPlug[7]" = "1" register "PcieRpLtrEnable[7]" = "1" -- To view, visit https://review.coreboot.org/c/coreboot/+/79153?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I178cb472a8f40baaccc30514689bda2730dfa9dc Gerrit-Change-Number: 79153 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-MessageType: newchange

1 0

[M] Change in coreboot[main]: util/kconfig: Uprev to Linux 6.1's kconfig
by Patrick Georgi (Code Review) 20 Nov '23

20 Nov '23

Patrick Georgi has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/79178?usp=email ) Change subject: util/kconfig: Uprev to Linux 6.1's kconfig ...................................................................... Abandoned reused old Change-Id (thanks to branch name change) -- To view, visit https://review.coreboot.org/c/coreboot/+/79178?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I77cc8517128a973c345c41da2c483b78eeaee89f Gerrit-Change-Number: 79178 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <patrick(a)coreboot.org> Gerrit-Reviewer: Elyes Haouas <ehaouas(a)noos.fr> Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: abandon

1 0

[M] Change in coreboot[main]: util/kconfig: Uprev to Linux 6.1's kconfig
by Patrick Georgi (Code Review) 20 Nov '23

20 Nov '23

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/79203?usp=email ) Change subject: util/kconfig: Uprev to Linux 6.1's kconfig ...................................................................... util/kconfig: Uprev to Linux 6.1's kconfig This also cleans up our patch queue. TEST=`util/abuild/abuild -C` output (config.h and config.build) remains the same Change-Id: I79159130ba3515ede59e9fb9fbf087e2ed76257a Signed-off-by: Patrick Georgi <patrick(a)coreboot.org> --- M util/kconfig/conf.c M util/kconfig/confdata.c M util/kconfig/lkc.h M util/kconfig/menu.c M util/kconfig/patches/0001-Kconfig-Add-KCONFIG_STRICT-mode.patch M util/kconfig/patches/0002-Kconfig-Change-symbol-override-from-warning-to-notic.patch M util/kconfig/patches/0005-util-kconfig-Ignore-extra-symbols-in-configs-instead.patch M util/kconfig/patches/0007-kconfig-Allow-KCONFIG_STRICT-outside-of-confdata.c.patch M util/kconfig/patches/0009-util-kconfig-Allow-emitting-false-booleans-into-kconfig-output.patch M util/kconfig/patches/0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch D util/kconfig/patches/0015-util-kconfig-chmod-w-before-savedefconfig.patch M util/kconfig/patches/series 12 files changed, 94 insertions(+), 70 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/79203/1 diff --git a/util/kconfig/conf.c b/util/kconfig/conf.c index e68da2d..fd33011 100644 --- a/util/kconfig/conf.c +++ b/util/kconfig/conf.c @@ -553,7 +553,7 @@ print_help(child); continue; } - sym_set_choice_value(sym, child->sym); + sym_set_tristate_value(child->sym, yes); for (child = child->list; child; child = child->next) { indent += 2; conf(child); diff --git a/util/kconfig/confdata.c b/util/kconfig/confdata.c index 1300ab6..726a96e 100644 --- a/util/kconfig/confdata.c +++ b/util/kconfig/confdata.c @@ -230,6 +230,13 @@ return name ? name : "include/generated/autoconf.h"; } +static const char *conf_get_rustccfg_name(void) +{ + char *name = getenv("KCONFIG_RUSTCCFG"); + + return name ? name : "include/generated/rustc_cfg"; +} + static const char *conf_get_autobase_name(void) { char *name = getenv("KCONFIG_SPLITCONFIG"); @@ -632,6 +639,9 @@ static void conf_write_heading(FILE *fp, const struct comment_style *cs) { + if (!cs) + return; + fprintf(fp, "%s\n", cs->prefix); fprintf(fp, "%s Automatically generated file; DO NOT EDIT.\n", @@ -787,6 +797,65 @@ free(escaped); } +static void print_symbol_for_rustccfg(FILE *fp, struct symbol *sym) +{ + const char *val; + const char *val_prefix = ""; + char *val_prefixed = NULL; + size_t val_prefixed_len; + char *escaped = NULL; + + if (sym->type == S_UNKNOWN) + return; + + val = sym_get_string_value(sym); + + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: + /* + * We do not care about disabled ones, i.e. no need for + * what otherwise are "comments" in other printers. + */ + if (*val == 'n') + return; + + /* + * To have similar functionality to the C macro `IS_ENABLED()` + * we provide an empty `--cfg CONFIG_X` here in both `y` + * and `m` cases. + * + * Then, the common `fprintf()` below will also give us + * a `--cfg CONFIG_X="y"` or `--cfg CONFIG_X="m"`, which can + * be used as the equivalent of `IS_BUILTIN()`/`IS_MODULE()`. + */ + fprintf(fp, "--cfg=%s%s\n", CONFIG_, sym->name); + break; + case S_HEX: + if (val[0] != '0' || (val[1] != 'x' && val[1] != 'X')) + val_prefix = "0x"; + break; + default: + break; + } + + if (strlen(val_prefix) > 0) { + val_prefixed_len = strlen(val) + strlen(val_prefix) + 1; + val_prefixed = xmalloc(val_prefixed_len); + snprintf(val_prefixed, val_prefixed_len, "%s%s", val_prefix, val); + val = val_prefixed; + } + + /* All values get escaped: the `--cfg` option only takes strings */ + escaped = escape_string_value(val); + val = escaped; + + fprintf(fp, "--cfg=%s%s=%s\n", CONFIG_, sym->name, val); + + free(escaped); + free(val_prefixed); +} + /* * Write out a minimal config. * All values that has default values are skipped as this is redundant. @@ -1175,6 +1244,12 @@ if (ret) return ret; + ret = __conf_write_autoconf(conf_get_rustccfg_name(), + print_symbol_for_rustccfg, + NULL); + if (ret) + return ret; + /* * Create include/config/auto.conf. This must be the last step because * Kbuild has a dependency on auto.conf and this marks the successful diff --git a/util/kconfig/lkc.h b/util/kconfig/lkc.h index 68dc847..559e04a 100644 --- a/util/kconfig/lkc.h +++ b/util/kconfig/lkc.h @@ -127,11 +127,6 @@ return (struct symbol *)sym->curr.val; } -static inline bool sym_set_choice_value(struct symbol *ch, struct symbol *chval) -{ - return sym_set_tristate_value(chval, yes); -} - static inline bool sym_is_choice(struct symbol *sym) { return sym->flags & SYMBOL_CHOICE ? true : false; diff --git a/util/kconfig/menu.c b/util/kconfig/menu.c index 62b6313..109325f 100644 --- a/util/kconfig/menu.c +++ b/util/kconfig/menu.c @@ -722,8 +722,8 @@ if (!expr_eq(prop->menu->dep, prop->visible.expr)) get_dep_str(r, prop->visible.expr, " Visible if: "); - menu = prop->menu->parent; - for (i = 0; menu && i < 8; menu = menu->parent) { + menu = prop->menu; + for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent) { bool accessible = menu_is_visible(menu); submenu[i++] = menu; @@ -733,16 +733,7 @@ if (head && location) { jump = xmalloc(sizeof(struct jump_key)); - if (menu_is_visible(prop->menu)) { - /* - * There is not enough room to put the hint at the - * beginning of the "Prompt" line. Put the hint on the - * last "Location" line even when it would belong on - * the former. - */ - jump->target = prop->menu; - } else - jump->target = location; + jump->target = location; if (list_empty(head)) jump->index = 0; @@ -758,13 +749,7 @@ menu = submenu[i]; if (jump && menu == location) jump->offset = strlen(r->s); - - if (menu == &rootmenu) - /* The real rootmenu prompt is ugly */ - str_printf(r, "%*cMain menu", j, ' '); - else - str_printf(r, "%*c-> %s", j, ' ', menu_get_prompt(menu)); - + str_printf(r, "%*c-> %s", j, ' ', menu_get_prompt(menu)); if (menu->sym) { str_printf(r, " (%s [=%s])", menu->sym->name ? menu->sym->name : "<choice>", diff --git a/util/kconfig/patches/0001-Kconfig-Add-KCONFIG_STRICT-mode.patch b/util/kconfig/patches/0001-Kconfig-Add-KCONFIG_STRICT-mode.patch index e87aaf5..9e50eb3 100644 --- a/util/kconfig/patches/0001-Kconfig-Add-KCONFIG_STRICT-mode.patch +++ b/util/kconfig/patches/0001-Kconfig-Add-KCONFIG_STRICT-mode.patch @@ -19,7 +19,7 @@ =================================================================== --- kconfig.orig/confdata.c +++ kconfig/confdata.c -@@ -430,6 +430,7 @@ load: +@@ -437,6 +437,7 @@ load: if (def == S_DEF_USER) { sym = sym_find(line + 2 + strlen(CONFIG_)); if (!sym) { @@ -27,7 +27,7 @@ conf_set_changed(true); continue; } -@@ -512,6 +513,13 @@ load: +@@ -519,6 +520,13 @@ load: } free(line); fclose(in); diff --git a/util/kconfig/patches/0002-Kconfig-Change-symbol-override-from-warning-to-notic.patch b/util/kconfig/patches/0002-Kconfig-Change-symbol-override-from-warning-to-notic.patch index cc37c07..c1ce249 100644 --- a/util/kconfig/patches/0002-Kconfig-Change-symbol-override-from-warning-to-notic.patch +++ b/util/kconfig/patches/0002-Kconfig-Change-symbol-override-from-warning-to-notic.patch @@ -40,7 +40,7 @@ static void conf_default_message_callback(const char *s) { printf("#\n# "); -@@ -440,7 +450,7 @@ load: +@@ -447,7 +457,7 @@ load: sym->type = S_BOOLEAN; } if (sym->flags & def_flags) { @@ -49,7 +49,7 @@ } switch (sym->type) { case S_BOOLEAN: -@@ -479,7 +489,7 @@ load: +@@ -486,7 +496,7 @@ load: } if (sym->flags & def_flags) { @@ -58,7 +58,7 @@ } if (conf_set_sym_val(sym, def, def_flags, p)) continue; -@@ -504,7 +514,7 @@ load: +@@ -511,7 +521,7 @@ load: break; case yes: if (cs->def[def].tri != no) diff --git a/util/kconfig/patches/0005-util-kconfig-Ignore-extra-symbols-in-configs-instead.patch b/util/kconfig/patches/0005-util-kconfig-Ignore-extra-symbols-in-configs-instead.patch index d8e2dfe..c05e4a6 100644 --- a/util/kconfig/patches/0005-util-kconfig-Ignore-extra-symbols-in-configs-instead.patch +++ b/util/kconfig/patches/0005-util-kconfig-Ignore-extra-symbols-in-configs-instead.patch @@ -24,7 +24,7 @@ =================================================================== --- kconfig.orig/confdata.c +++ kconfig/confdata.c -@@ -440,7 +440,9 @@ load: +@@ -447,7 +447,9 @@ load: if (def == S_DEF_USER) { sym = sym_find(line + 2 + strlen(CONFIG_)); if (!sym) { diff --git a/util/kconfig/patches/0007-kconfig-Allow-KCONFIG_STRICT-outside-of-confdata.c.patch b/util/kconfig/patches/0007-kconfig-Allow-KCONFIG_STRICT-outside-of-confdata.c.patch index 13e4d89..05a92d4 100644 --- a/util/kconfig/patches/0007-kconfig-Allow-KCONFIG_STRICT-outside-of-confdata.c.patch +++ b/util/kconfig/patches/0007-kconfig-Allow-KCONFIG_STRICT-outside-of-confdata.c.patch @@ -62,7 +62,7 @@ =================================================================== --- kconfig.orig/confdata.c +++ kconfig/confdata.c -@@ -530,11 +530,7 @@ load: +@@ -537,11 +537,7 @@ load: free(line); fclose(in); diff --git a/util/kconfig/patches/0009-util-kconfig-Allow-emitting-false-booleans-into-kconfig-output.patch b/util/kconfig/patches/0009-util-kconfig-Allow-emitting-false-booleans-into-kconfig-output.patch index c74ef67..bfb89f9 100644 --- a/util/kconfig/patches/0009-util-kconfig-Allow-emitting-false-booleans-into-kconfig-output.patch +++ b/util/kconfig/patches/0009-util-kconfig-Allow-emitting-false-booleans-into-kconfig-output.patch @@ -14,7 +14,7 @@ =================================================================== --- kconfig.orig/confdata.c +++ kconfig/confdata.c -@@ -715,7 +715,12 @@ static void print_symbol_for_dotconfig(F +@@ -725,7 +725,12 @@ static void print_symbol_for_dotconfig(F static void print_symbol_for_autoconf(FILE *fp, struct symbol *sym) { @@ -28,7 +28,7 @@ } void print_symbol_for_listconfig(struct symbol *sym) -@@ -740,6 +745,10 @@ static void print_symbol_for_c(FILE *fp, +@@ -750,6 +755,10 @@ static void print_symbol_for_c(FILE *fp, case S_TRISTATE: switch (*val) { case 'n': @@ -39,7 +39,7 @@ return; case 'm': sym_suffix = "_MODULE"; -@@ -751,6 +760,12 @@ static void print_symbol_for_c(FILE *fp, +@@ -761,6 +770,12 @@ static void print_symbol_for_c(FILE *fp, case S_HEX: if (val[0] != '0' || (val[1] != 'x' && val[1] != 'X')) val_prefix = "0x"; @@ -52,7 +52,7 @@ break; case S_STRING: escaped = escape_string_value(val); -@@ -1108,8 +1123,9 @@ static int __conf_write_autoconf(const c +@@ -1177,8 +1192,9 @@ static int __conf_write_autoconf(const c conf_write_heading(file, comment_style); diff --git a/util/kconfig/patches/0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch b/util/kconfig/patches/0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch index 869adef..09079cd 100644 --- a/util/kconfig/patches/0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch +++ b/util/kconfig/patches/0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch @@ -21,8 +21,8 @@ =================================================================== --- kconfig.orig/confdata.c +++ kconfig/confdata.c -@@ -230,6 +230,13 @@ static const char *conf_get_autoheader_n - return name ? name : "include/generated/autoconf.h"; +@@ -237,6 +237,13 @@ static const char *conf_get_rustccfg_nam + return name ? name : "include/generated/rustc_cfg"; } +static const char *conf_get_autobase_name(void) @@ -35,7 +35,7 @@ static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p) { char *p2; -@@ -1024,19 +1031,19 @@ static int conf_write_autoconf_cmd(const +@@ -1093,19 +1100,19 @@ static int conf_write_autoconf_cmd(const static int conf_touch_deps(void) { diff --git a/util/kconfig/patches/0015-util-kconfig-chmod-w-before-savedefconfig.patch b/util/kconfig/patches/0015-util-kconfig-chmod-w-before-savedefconfig.patch deleted file mode 100644 index 2b96723..0000000 --- a/util/kconfig/patches/0015-util-kconfig-chmod-w-before-savedefconfig.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 48ad5c23680c81614663e09c6586ebeb26bf8c18 Mon Sep 17 00:00:00 2001 -From: Richard Marko <srk(a)48.io> -Date: Mon, 16 Oct 2023 15:26:33 +0200 -Subject: [PATCH] util/kconfig: chmod +w before savedefconfig - -This prevents a headscratcher when .config in root doesn't have a write -permission bit set which causes a build failure of savedefconfig -not able to write to copied file, for example - -*** Error while saving defconfig to: - build/mainboard/emulation/qemu-i440fx/cbfs-file.eU5E0t.out.tmp2 - -Change-Id: I2e7d35c9f6e8add3e7438d163850bc5fda5a99b2 -Signed-off-by: Richard Marko <srk(a)48.io> ---- - util/kconfig/Makefile.inc | 1 + - 1 file changed, 1 insertion(+) - -Index: kconfig/Makefile.inc -=================================================================== ---- kconfig.orig/Makefile.inc -+++ kconfig/Makefile.inc -@@ -34,6 +34,7 @@ oldconfig: KCONFIG_STRICT= - - savedefconfig: $(objk)/conf - cp $(DOTCONFIG) $(DEFCONFIG) -+ chmod +w $(DEFCONFIG) - $< --savedefconfig=$(DEFCONFIG) $(KBUILD_KCONFIG) - - FORCE: diff --git a/util/kconfig/patches/series b/util/kconfig/patches/series index 252eb64..655c493 100644 --- a/util/kconfig/patches/series +++ b/util/kconfig/patches/series @@ -10,4 +10,3 @@ 0010-reenable-source-in-choice.patch 0013-util-kconfig-detect-ncurses-on-FreeBSD.patch 0014-util-kconfig-Move-Kconfig-deps-back-into-build-confi.patch -0015-util-kconfig-chmod-w-before-savedefconfig.patch -- To view, visit https://review.coreboot.org/c/coreboot/+/79203?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I79159130ba3515ede59e9fb9fbf087e2ed76257a Gerrit-Change-Number: 79203 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <patrick(a)coreboot.org> Gerrit-MessageType: newchange

1 0

[S] Change in coreboot[main]: util/kconfig: Uprev to Linux 6.5's kconfig
by Patrick Georgi (Code Review) 20 Nov '23

20 Nov '23

Attention is currently required from: Martin L Roth. Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/79182?usp=email ) Change subject: util/kconfig: Uprev to Linux 6.5's kconfig ...................................................................... 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(a)coreboot.org> --- M util/kconfig/gconf.c M util/kconfig/streamline_config.pl 2 files changed, 5 insertions(+), 8 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/79182/1 diff --git a/util/kconfig/gconf.c b/util/kconfig/gconf.c index 17adabf..9709aca 100644 --- a/util/kconfig/gconf.c +++ b/util/kconfig/gconf.c @@ -636,7 +636,7 @@ { 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 @@ "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 @@ { GtkWidget *dialog; const gchar *about_text = - "gkc is copyright (c) 2002 Romain Lievin <roms(a)lpg.ticalc.org>.\n" + "gconfig is copyright (c) 2002 Romain Lievin <roms(a)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 @@ { 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 3387ad7..d51cd7a 100755 --- a/util/kconfig/streamline_config.pl +++ b/util/kconfig/streamline_config.pl @@ -317,7 +317,7 @@ $_ = 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; -- To view, visit https://review.coreboot.org/c/coreboot/+/79182?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: If717d064d87b0045f276a4ee963db0a62230f5d8 Gerrit-Change-Number: 79182 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <patrick(a)coreboot.org> Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com> Gerrit-Attention: Martin L Roth <gaumless(a)gmail.com> Gerrit-MessageType: newchange

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit November 2023