GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amdfwtool: Add SOC family definition for Carrizo 

For Carrizo, the soc name was set as UNKNOWN.

The change is supposed to be binary unmodified, except the SPI
settings. According to the spec, the Stoneyridge and Carrizo have the
same definition of SPI setting in EFS.

Change-Id: I9704a44773b2f541f650451ed883a51e2939e12a
Signed-off-by: Zheng Bao <fishbaozi@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/66823
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
This commit is contained in:
Zheng Bao 2022-08-17 11:52:30 +08:00 committed by Fred Reitberger
parent 4e8fb3503c
commit 3d7623ffc9
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/soc/amd/stoneyridge/Makefile.inc
View File

@ -127,6 +127,11 @@ OPT_COMBOCAPABLE=--combo-capable
OPT_SOCNAME=--soc-name "Stoneyridge" OPT_SOCNAME=--soc-name "Stoneyridge"
endif endif
ifeq ($(FIRMWARE_TYPE),CZ)
OPT_COMBOCAPABLE=--combo-capable
OPT_SOCNAME=--soc-name "Carrizo"
endif
ifeq ($(CONFIG_USE_PSPSECUREOS),y) ifeq ($(CONFIG_USE_PSPSECUREOS),y)
PSP_USE_PSPSECUREOS="--use-pspsecureos" PSP_USE_PSPSECUREOS="--use-pspsecureos"
endif endif

12
util/amdfwtool/amdfwtool.c
View File

@ -229,8 +229,9 @@ static void usage(void)
printf("--sharedmem-size Maximum size of the PSP/FW shared memory\n"); printf("--sharedmem-size Maximum size of the PSP/FW shared memory\n");
printf(" area\n"); printf(" area\n");
printf("--soc-name <socname> Specify SOC name. Supported names are\n"); printf("--soc-name <socname> Specify SOC name. Supported names are\n");
printf(" Stoneyridge, Raven, Picasso, Renoir, Cezanne\n"); printf(" Carrizo, Stoneyridge, Raven, Picasso, Renoir,\n");
printf(" Mendocino, Phoenix, Glinda, or Lucienne\n"); printf(" Cezanne, Mendocino, Phoenix, Glinda, or\n");
printf(" Lucienne\n");
printf("\nEmbedded Firmware Structure options used by the PSP:\n"); printf("\nEmbedded Firmware Structure options used by the PSP:\n");
printf("--spi-speed <HEX_VAL> SPI fast speed to place in EFS Table\n"); printf("--spi-speed <HEX_VAL> SPI fast speed to place in EFS Table\n");
printf(" 0x0 66.66Mhz\n"); printf(" 0x0 66.66Mhz\n");
@ -713,6 +714,7 @@ static ssize_t write_from_buf_to_file(int fd, const void *buf, size_t buf_size)
enum platform { enum platform {
PLATFORM_UNKNOWN, PLATFORM_UNKNOWN,
PLATFORM_CARRIZO,
PLATFORM_STONEYRIDGE, PLATFORM_STONEYRIDGE,
PLATFORM_RAVEN, PLATFORM_RAVEN,
PLATFORM_PICASSO, PLATFORM_PICASSO,
@ -751,6 +753,7 @@ static uint32_t get_psp_id(enum platform soc_id)
case PLATFORM_PHOENIX: case PLATFORM_PHOENIX:
psp_id = 0xBC0D0400; psp_id = 0xBC0D0400;
break; break;
case PLATFORM_CARRIZO:
default: default:
psp_id = 0; psp_id = 0;
break; break;
@ -1970,6 +1973,7 @@ static int set_efs_table(uint8_t soc_id, amd_cb_config *cb_config,
} }
switch (soc_id) { switch (soc_id) {
case PLATFORM_CARRIZO:
case PLATFORM_STONEYRIDGE: case PLATFORM_STONEYRIDGE:
amd_romsig->spi_readmode_f15_mod_60_6f = efs_spi_readmode; amd_romsig->spi_readmode_f15_mod_60_6f = efs_spi_readmode;
amd_romsig->fast_speed_new_f15_mod_60_6f = efs_spi_speed; amd_romsig->fast_speed_new_f15_mod_60_6f = efs_spi_speed;
@ -2073,6 +2077,8 @@ static int identify_platform(char *soc_name)
{ {
if (!strcasecmp(soc_name, "Stoneyridge")) if (!strcasecmp(soc_name, "Stoneyridge"))
return PLATFORM_STONEYRIDGE; return PLATFORM_STONEYRIDGE;
else if (!strcasecmp(soc_name, "Carrizo"))
return PLATFORM_CARRIZO;
else if (!strcasecmp(soc_name, "Raven")) else if (!strcasecmp(soc_name, "Raven"))
return PLATFORM_RAVEN; return PLATFORM_RAVEN;
else if (!strcasecmp(soc_name, "Picasso")) else if (!strcasecmp(soc_name, "Picasso"))
@ -2105,6 +2111,7 @@ static bool needs_ish(enum platform platform_type)
static bool is_second_gen(enum platform platform_type) static bool is_second_gen(enum platform platform_type)
{ {
switch (platform_type) { switch (platform_type) {
case PLATFORM_CARRIZO:
case PLATFORM_STONEYRIDGE: case PLATFORM_STONEYRIDGE:
case PLATFORM_RAVEN: case PLATFORM_RAVEN:
case PLATFORM_PICASSO: case PLATFORM_PICASSO:
@ -2683,6 +2690,7 @@ int main(int argc, char **argv)
case PLATFORM_PHOENIX: case PLATFORM_PHOENIX:
case PLATFORM_GLINDA: case PLATFORM_GLINDA:
break; break;
case PLATFORM_CARRIZO:
case PLATFORM_STONEYRIDGE: case PLATFORM_STONEYRIDGE:
case PLATFORM_RAVEN: case PLATFORM_RAVEN:
case PLATFORM_PICASSO: case PLATFORM_PICASSO: