erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

util/amdfwtool: rename Glinda SoC to Strix

Browse source 
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 <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/91716
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Patrick Rudolph <patrick.rudolph@9elements.com>
This commit is contained in:
Felix Held 2026-03-10 16:26:18 +01:00 • committed by Matt DeVillier
commit 1555a1a235
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/soc/amd/glinda/fw.cfg
View file

@ -1,7 +1,7 @@
# PSP fw config file # PSP fw config file
FIRMWARE_LOCATION 3rdparty/amd_blobs/glinda/psp FIRMWARE_LOCATION 3rdparty/amd_blobs/glinda/psp
SOC_NAME Glinda SOC_NAME Strix
# type file # type file
AMD_PUBKEY_FILE TypeId0x00_Root.tkn AMD_PUBKEY_FILE TypeId0x00_Root.tkn

10
util/amdfwtool/amdfwtool.c
View file

@ -666,7 +666,7 @@ static void fill_psp_directory_to_efs(embedded_firmware *amd_romsig, void *pspdi
case PLATFORM_CEZANNE: case PLATFORM_CEZANNE:
case PLATFORM_MENDOCINO: case PLATFORM_MENDOCINO:
case PLATFORM_PHOENIX: case PLATFORM_PHOENIX:
case PLATFORM_GLINDA: case PLATFORM_STRIX:
case PLATFORM_CARRIZO: case PLATFORM_CARRIZO:
case PLATFORM_STONEYRIDGE: case PLATFORM_STONEYRIDGE:
case PLATFORM_RAVEN: case PLATFORM_RAVEN:
@ -706,7 +706,7 @@ static void fill_bios_directory_to_efs(embedded_firmware *amd_romsig, void *bios
break; break;
case PLATFORM_MENDOCINO: case PLATFORM_MENDOCINO:
case PLATFORM_PHOENIX: case PLATFORM_PHOENIX:
case PLATFORM_GLINDA: case PLATFORM_STRIX:
case PLATFORM_FAEGAN: case PLATFORM_FAEGAN:
case PLATFORM_STRIXHALO: case PLATFORM_STRIXHALO:
break; break;
@ -742,7 +742,7 @@ static uint32_t get_psp_id(enum platform soc_id)
case PLATFORM_STONEYRIDGE: case PLATFORM_STONEYRIDGE:
psp_id = 0x10220B00; psp_id = 0x10220B00;
break; break;
case PLATFORM_GLINDA: case PLATFORM_STRIX:
psp_id = 0xBC0E0200; psp_id = 0xBC0E0200;
break; break;
case PLATFORM_PHOENIX: 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_CEZANNE:
case PLATFORM_MENDOCINO: case PLATFORM_MENDOCINO:
case PLATFORM_PHOENIX: case PLATFORM_PHOENIX:
case PLATFORM_GLINDA: case PLATFORM_STRIX:
case PLATFORM_GENOA: case PLATFORM_GENOA:
case PLATFORM_FAEGAN: case PLATFORM_FAEGAN:
case PLATFORM_STRIXHALO: case PLATFORM_STRIXHALO:
@ -1683,7 +1683,7 @@ static bool is_initial_alignment_required(enum platform soc_id)
switch (soc_id) { switch (soc_id) {
case PLATFORM_MENDOCINO: case PLATFORM_MENDOCINO:
case PLATFORM_PHOENIX: case PLATFORM_PHOENIX:
case PLATFORM_GLINDA: case PLATFORM_STRIX:
case PLATFORM_FAEGAN: case PLATFORM_FAEGAN:
case PLATFORM_STRIXHALO: case PLATFORM_STRIXHALO:
return false; return false;

2
util/amdfwtool/amdfwtool.h
View file

@ -32,7 +32,7 @@ enum platform {
PLATFORM_MENDOCINO, PLATFORM_MENDOCINO,
PLATFORM_LUCIENNE, PLATFORM_LUCIENNE,
PLATFORM_PHOENIX, PLATFORM_PHOENIX,
PLATFORM_GLINDA, PLATFORM_STRIX,
PLATFORM_GENOA, PLATFORM_GENOA,
PLATFORM_FAEGAN, PLATFORM_FAEGAN,
PLATFORM_STRIXHALO, PLATFORM_STRIXHALO,

8
util/amdfwtool/data_parse.c
View file

@ -113,8 +113,8 @@ static enum platform identify_platform(char *soc_name)
return PLATFORM_LUCIENNE; return PLATFORM_LUCIENNE;
else if (!strcasecmp(soc_name, "Phoenix")) else if (!strcasecmp(soc_name, "Phoenix"))
return PLATFORM_PHOENIX; return PLATFORM_PHOENIX;
else if (!strcasecmp(soc_name, "Glinda")) else if (!strcasecmp(soc_name, "Strix"))
return PLATFORM_GLINDA; return PLATFORM_STRIX;
else if (!strcasecmp(soc_name, "Genoa")) else if (!strcasecmp(soc_name, "Genoa"))
return PLATFORM_GENOA; return PLATFORM_GENOA;
else if (!strcasecmp(soc_name, "Faegan")) 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) static bool needs_ish(enum platform platform_type)
{ {
if (platform_type == PLATFORM_MENDOCINO || platform_type == PLATFORM_PHOENIX || 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) platform_type == PLATFORM_STRIXHALO)
return true; return true;
else else
@ -818,7 +818,7 @@ static bool is_second_gen(enum platform platform_type)
case PLATFORM_CEZANNE: case PLATFORM_CEZANNE:
case PLATFORM_MENDOCINO: case PLATFORM_MENDOCINO:
case PLATFORM_PHOENIX: case PLATFORM_PHOENIX:
case PLATFORM_GLINDA: case PLATFORM_STRIX:
case PLATFORM_GENOA: case PLATFORM_GENOA:
case PLATFORM_FAEGAN: case PLATFORM_FAEGAN:
case PLATFORM_STRIXHALO: case PLATFORM_STRIXHALO:

2
util/amdfwtool/signed_psp.c
View file

@ -39,7 +39,7 @@ static uint16_t get_psp_fw_type(enum platform soc_id, struct amd_fw_header *head
switch (soc_id) { switch (soc_id) {
case PLATFORM_MENDOCINO: case PLATFORM_MENDOCINO:
case PLATFORM_PHOENIX: case PLATFORM_PHOENIX:
case PLATFORM_GLINDA: case PLATFORM_STRIX:
case PLATFORM_FAEGAN: case PLATFORM_FAEGAN:
case PLATFORM_STRIXHALO: case PLATFORM_STRIXHALO:
/* Fallback to fw_type if fw_id is not populated, which serves the same /* Fallback to fw_type if fw_id is not populated, which serves the same