The outcome of that merge went a bit weird for board/starfive/visionfive2/spl.c
On 4/25/25 16:43, Tom Rini wrote: > On Fri, 25 Apr 2025 18:07:54 +0800, Leo Liang wrote: > >> The following changes since commit 10f48365112b164bee6564033ab682747efcb483: >> >> Merge patch series "Add PCIe support for TI AM64 SoC" (2025-04-24 10:46:17 >> -0600) >> >> are available in the Git repository at: >> >> https://source.denx.de/u-boot/custodians/u-boot-riscv.git >> >> [...] > > Merged into u-boot/master, thanks! > # The fix: diff --git a/board/starfive/visionfive2/spl.c b/board/starfive/visionfive2/spl.c index 353313b9e88..5b9f2530470 100644 --- a/board/starfive/visionfive2/spl.c +++ b/board/starfive/visionfive2/spl.c @@ -116,44 +116,23 @@ void board_init_f(ulong dummy) #if CONFIG_IS_ENABLED(LOAD_FIT) int board_fit_config_name_match(const char *name) { - const char *product_id; - u8 version; - - product_id = get_product_id_from_eeprom(); - - /* Strip off prefix */ - if (strncmp(name, "starfive/", 9)) - return -EINVAL; - name += 9; - if (!strncmp(product_id, "FML13V01", 8) && - !strcmp(name, "jh7110-deepcomputing-fml13v01")) { - return 0; - } else if (!strncmp(product_id, "VF7110", 6)) { - version = get_pcb_revision_from_eeprom(); - if ((version == 'b' || version == 'B') && - !strcmp(name, "jh7110-starfive-visionfive-2-v1.3b")) - return 0; - - if ((version == 'a' || version == 'A') && - !strcmp(name, "jh7110-starfive-visionfive-2-v1.2a")) - return 0; - } else if (!strncmp(product_id, "MARS", 4) && - !strcmp(name, "jh7110-milkv-mars")) { + if (!strcmp(name, "starfive/jh7110-deepcomputing-fml13v01") && + !strncmp(get_product_id_from_eeprom(), "FML13V01", 8)) { return 0; } else if (!strcmp(name, "starfive/jh7110-milkv-mars") && - !strncmp(get_product_id_from_eeprom(), "MARS", 4)) { + !strncmp(get_product_id_from_eeprom(), "MARS", 4)) { return 0; - } else if ((!strcmp(name, "starfive/jh7110-pine64-star64")) && + } else if (!strcmp(name, "starfive/jh7110-pine64-star64") && !strncmp(get_product_id_from_eeprom(), "STAR64", 6)) { return 0; - } else if ((!strcmp(name, "starfive/jh7110-starfive-visionfive-2-v1.2a")) && + } else if (!strcmp(name, "starfive/jh7110-starfive-visionfive-2-v1.2a") && !strncmp(get_product_id_from_eeprom(), "VF7110", 6)) { switch (get_pcb_revision_from_eeprom()) { case 'a': case 'A': return 0; } - } else if ((!strcmp(name, "starfive/jh7110-starfive-visionfive-2-v1.2b")) && + } else if (!strcmp(name, "starfive/jh7110-starfive-visionfive-2-v1.2b") && !strncmp(get_product_id_from_eeprom(), "VF7110", 6)) { switch (get_pcb_revision_from_eeprom()) { case 'b': # So when applied that function should end up like this: #if CONFIG_IS_ENABLED(LOAD_FIT) int board_fit_config_name_match(const char *name) { if (!strcmp(name, "starfive/jh7110-deepcomputing-fml13v01") && !strncmp(get_product_id_from_eeprom(), "FML13V01", 8)) { return 0; } else if (!strcmp(name, "starfive/jh7110-milkv-mars") && !strncmp(get_product_id_from_eeprom(), "MARS", 4)) { return 0; } else if (!strcmp(name, "starfive/jh7110-pine64-star64") && !strncmp(get_product_id_from_eeprom(), "STAR64", 6)) { return 0; } else if (!strcmp(name, "starfive/jh7110-starfive-visionfive-2-v1.2a") && !strncmp(get_product_id_from_eeprom(), "VF7110", 6)) { switch (get_pcb_revision_from_eeprom()) { case 'a': case 'A': return 0; } } else if (!strcmp(name, "starfive/jh7110-starfive-visionfive-2-v1.2b") && !strncmp(get_product_id_from_eeprom(), "VF7110", 6)) { switch (get_pcb_revision_from_eeprom()) { case 'b': case 'B': return 0; } } return -EINVAL; } #endif
