From 1555a1a235a8c51d40ce88eeb88750bb89f24c0c Mon Sep 17 00:00:00 2001 From: Felix Held Date: Tue, 10 Mar 2026 16:26:18 +0100 Subject: [PATCH] util/amdfwtool: rename Glinda SoC to Strix Glinda is an alias for Strix. This only changes the SoC name in amdfwtool; SoC folder will be renamed later once all remaining patches have been upstreamed, since renaming the SoC folder right now, would just make the upstreaming more difficult. Change-Id: I10cb9c4a97dd2689fe02329262772b05d24a5896 Signed-off-by: Felix Held Reviewed-on: https://review.coreboot.org/c/coreboot/+/91716 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Patrick Rudolph --- src/soc/amd/glinda/fw.cfg | 2 +- util/amdfwtool/amdfwtool.c | 10 +++++----- util/amdfwtool/amdfwtool.h | 2 +- util/amdfwtool/data_parse.c | 8 ++++---- util/amdfwtool/signed_psp.c | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/soc/amd/glinda/fw.cfg b/src/soc/amd/glinda/fw.cfg index a689a7f0e0..88f79db453 100644 --- a/src/soc/amd/glinda/fw.cfg +++ b/src/soc/amd/glinda/fw.cfg @@ -1,7 +1,7 @@ # PSP fw config file FIRMWARE_LOCATION 3rdparty/amd_blobs/glinda/psp -SOC_NAME Glinda +SOC_NAME Strix # type file AMD_PUBKEY_FILE TypeId0x00_Root.tkn diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index 6cd991110a..96acb3601b 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -666,7 +666,7 @@ static void fill_psp_directory_to_efs(embedded_firmware *amd_romsig, void *pspdi case PLATFORM_CEZANNE: case PLATFORM_MENDOCINO: case PLATFORM_PHOENIX: - case PLATFORM_GLINDA: + case PLATFORM_STRIX: case PLATFORM_CARRIZO: case PLATFORM_STONEYRIDGE: case PLATFORM_RAVEN: @@ -706,7 +706,7 @@ static void fill_bios_directory_to_efs(embedded_firmware *amd_romsig, void *bios break; case PLATFORM_MENDOCINO: case PLATFORM_PHOENIX: - case PLATFORM_GLINDA: + case PLATFORM_STRIX: case PLATFORM_FAEGAN: case PLATFORM_STRIXHALO: break; @@ -742,7 +742,7 @@ static uint32_t get_psp_id(enum platform soc_id) case PLATFORM_STONEYRIDGE: psp_id = 0x10220B00; break; - case PLATFORM_GLINDA: + case PLATFORM_STRIX: psp_id = 0xBC0E0200; break; case PLATFORM_PHOENIX: @@ -1622,7 +1622,7 @@ static int set_efs_table(uint8_t soc_id, amd_cb_config *cb_config, case PLATFORM_CEZANNE: case PLATFORM_MENDOCINO: case PLATFORM_PHOENIX: - case PLATFORM_GLINDA: + case PLATFORM_STRIX: case PLATFORM_GENOA: case PLATFORM_FAEGAN: case PLATFORM_STRIXHALO: @@ -1683,7 +1683,7 @@ static bool is_initial_alignment_required(enum platform soc_id) switch (soc_id) { case PLATFORM_MENDOCINO: case PLATFORM_PHOENIX: - case PLATFORM_GLINDA: + case PLATFORM_STRIX: case PLATFORM_FAEGAN: case PLATFORM_STRIXHALO: return false; diff --git a/util/amdfwtool/amdfwtool.h b/util/amdfwtool/amdfwtool.h index e0fae5e697..6e5d495823 100644 --- a/util/amdfwtool/amdfwtool.h +++ b/util/amdfwtool/amdfwtool.h @@ -32,7 +32,7 @@ enum platform { PLATFORM_MENDOCINO, PLATFORM_LUCIENNE, PLATFORM_PHOENIX, - PLATFORM_GLINDA, + PLATFORM_STRIX, PLATFORM_GENOA, PLATFORM_FAEGAN, PLATFORM_STRIXHALO, diff --git a/util/amdfwtool/data_parse.c b/util/amdfwtool/data_parse.c index 961b6a1c18..57341d7fe9 100644 --- a/util/amdfwtool/data_parse.c +++ b/util/amdfwtool/data_parse.c @@ -113,8 +113,8 @@ static enum platform identify_platform(char *soc_name) return PLATFORM_LUCIENNE; else if (!strcasecmp(soc_name, "Phoenix")) return PLATFORM_PHOENIX; - else if (!strcasecmp(soc_name, "Glinda")) - return PLATFORM_GLINDA; + else if (!strcasecmp(soc_name, "Strix")) + return PLATFORM_STRIX; else if (!strcasecmp(soc_name, "Genoa")) return PLATFORM_GENOA; else if (!strcasecmp(soc_name, "Faegan")) @@ -793,7 +793,7 @@ static uint8_t process_one_line(char *oneline, regmatch_t *match, char *dir, static bool needs_ish(enum platform platform_type) { if (platform_type == PLATFORM_MENDOCINO || platform_type == PLATFORM_PHOENIX || - platform_type == PLATFORM_GLINDA || platform_type == PLATFORM_FAEGAN || + platform_type == PLATFORM_STRIX || platform_type == PLATFORM_FAEGAN || platform_type == PLATFORM_STRIXHALO) return true; else @@ -818,7 +818,7 @@ static bool is_second_gen(enum platform platform_type) case PLATFORM_CEZANNE: case PLATFORM_MENDOCINO: case PLATFORM_PHOENIX: - case PLATFORM_GLINDA: + case PLATFORM_STRIX: case PLATFORM_GENOA: case PLATFORM_FAEGAN: case PLATFORM_STRIXHALO: diff --git a/util/amdfwtool/signed_psp.c b/util/amdfwtool/signed_psp.c index 14d0a13b9b..9d6bad0b0b 100644 --- a/util/amdfwtool/signed_psp.c +++ b/util/amdfwtool/signed_psp.c @@ -39,7 +39,7 @@ static uint16_t get_psp_fw_type(enum platform soc_id, struct amd_fw_header *head switch (soc_id) { case PLATFORM_MENDOCINO: case PLATFORM_PHOENIX: - case PLATFORM_GLINDA: + case PLATFORM_STRIX: case PLATFORM_FAEGAN: case PLATFORM_STRIXHALO: /* Fallback to fw_type if fw_id is not populated, which serves the same