diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2022-03-24 02:04:51 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-03-27 15:21:21 +0000 |
| commit | 5f18bb75fba7e649c7c14235982712271e0d3d92 (patch) | |
| tree | 8a7ea7511e7021cc2225e215da1b9c1282b7ef8c | |
| parent | b6bb0c88be0d137964342caf01a3a368a5b92f2c (diff) | |
util/amdfwtool: add MSMU, SPIROM_CFG and DMCUB PSP FW types
Compared to Cezanne, the Sabrina SoC has a 3 additional PSP firmware
table entries, so add those as a preparation for Sabrina support.
Signed-off-by: Zheng Bao <fishbaozi@gmail.com>
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Iaa5aacd53b3c7637f6d5e94b1a8d92bba57ddb9d
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63120
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
| -rw-r--r-- | util/amdfwtool/amdfwtool.c | 3 | ||||
| -rw-r--r-- | util/amdfwtool/amdfwtool.h | 3 | ||||
| -rw-r--r-- | util/amdfwtool/data_parse.c | 9 |
3 files changed, 15 insertions, 0 deletions
diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index 8023595d5c..263336a7f1 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -260,6 +260,9 @@ amd_fw_entry amd_psp_fw_table[] = { { .type = AMD_FW_SPL, .level = PSP_LVL2 | PSP_LVL2_AB }, { .type = AMD_FW_DMCU_ERAM, .level = PSP_LVL2 | PSP_LVL2_AB }, { .type = AMD_FW_DMCU_ISR, .level = PSP_LVL2 | PSP_LVL2_AB }, + { .type = AMD_FW_MSMU, .level = PSP_LVL2 | PSP_LVL2_AB }, + { .type = AMD_FW_DMCUB, .level = PSP_LVL2 | PSP_LVL2_AB }, + { .type = AMD_FW_SPIROM_CFG, .level = PSP_LVL2 | PSP_LVL2_AB }, { .type = AMD_RPMC_NVRAM, .level = PSP_LVL2 | PSP_LVL2_AB }, { .type = AMD_FW_PSP_BOOTLOADER_AB, .level = PSP_LVL2 | PSP_LVL2_AB }, { .type = AMD_ABL0, .level = PSP_BOTH | PSP_LVL2_AB }, diff --git a/util/amdfwtool/amdfwtool.h b/util/amdfwtool/amdfwtool.h index 70afe3c6df..ff2f63bb8f 100644 --- a/util/amdfwtool/amdfwtool.h +++ b/util/amdfwtool/amdfwtool.h @@ -54,6 +54,9 @@ typedef enum _amd_fw_type { AMD_FW_SPL = 0x55, AMD_FW_DMCU_ERAM = 0x58, AMD_FW_DMCU_ISR = 0x59, + AMD_FW_MSMU = 0x5a, + AMD_FW_SPIROM_CFG = 0x5c, + AMD_FW_DMCUB = 0x71, AMD_FW_PSP_BOOTLOADER_AB = 0x73, AMD_FW_IMC = 0x200, /* Large enough to be larger than the top BHD entry type. */ AMD_FW_GEC, diff --git a/util/amdfwtool/data_parse.c b/util/amdfwtool/data_parse.c index e883d17d0e..09b975d4a4 100644 --- a/util/amdfwtool/data_parse.c +++ b/util/amdfwtool/data_parse.c @@ -306,6 +306,15 @@ static uint8_t find_register_fw_filename_psp_dir(char *fw_name, char *filename, } else if (strcmp(fw_name, "DMCUINTVECTORSDCN21_FILE") == 0) { fw_type = AMD_FW_DMCU_ISR; subprog = 0; + } else if (strcmp(fw_name, "MSMU_FILE") == 0) { + fw_type = AMD_FW_MSMU; + subprog = 0; + } else if (strcmp(fw_name, "DMCUB_FILE") == 0) { + fw_type = AMD_FW_DMCUB; + subprog = 0; + } else if (strcmp(fw_name, "SPIROM_CONFIG_FILE") == 0) { + fw_type = AMD_FW_SPIROM_CFG; + subprog = 0; } else if (strcmp(fw_name, "PSP_KVM_ENGINE_DUMMY_FILE") == 0) { fw_type = AMD_FW_KVM_IMAGE; subprog = 0; |