summaryrefslogtreecommitdiff
path: root/util/amdfwtool
diff options
context:
space:
mode:
authorZheng Bao <fishbaozi@gmail.com>2023-03-07 19:48:11 +0800
committerFelix Held <felix-coreboot@felixheld.de>2023-03-10 13:39:23 +0000
commit9bb62cb364b95c21161dc52a66f11bd8ef60cc50 (patch)
treeb93698efb1a996129dce1bc5110b0c1aa1907a81 /util/amdfwtool
parent6bd9d959ddc3fabd84c57de41c6a1db7c400f562 (diff)
amdfwtool: Add HW IPCFG file whose subprog is 1
And rename PSP_HW_IPCFG_FILE to PSP_HW_IPCFG_FILE_SUB0 Change-Id: Ia1ab8482074105de367905be2b4b0418066823d2 Signed-off-by: Zheng Bao <fishbaozi@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/73531 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
Diffstat (limited to 'util/amdfwtool')
-rw-r--r--util/amdfwtool/amdfwtool.c3
-rw-r--r--util/amdfwtool/data_parse.c5
2 files changed, 6 insertions, 2 deletions
diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index 53cfa77863..e53e5dc0b3 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -279,7 +279,8 @@ amd_fw_entry amd_psp_fw_table[] = {
{ .type = AMD_DEBUG_DRIVER, .level = PSP_BOTH | PSP_LVL2_AB },
{ .type = AMD_INTERFACE_DRIVER, .level = PSP_BOTH | PSP_LVL2_AB },
{ .type = AMD_DEBUG_UNLOCK, .level = PSP_LVL2 | PSP_LVL2_AB },
- { .type = AMD_HW_IPCFG, .level = PSP_LVL2 | PSP_LVL2_AB },
+ { .type = AMD_HW_IPCFG, .subprog = 0, .level = PSP_LVL2 | PSP_LVL2_AB },
+ { .type = AMD_HW_IPCFG, .subprog = 1, .level = PSP_LVL2 | PSP_LVL2_AB },
{ .type = AMD_WRAPPED_IKEK, .level = PSP_BOTH | PSP_LVL2_AB, .skip_hashing = true },
{ .type = AMD_TOKEN_UNLOCK, .level = PSP_BOTH | PSP_LVL2_AB },
{ .type = AMD_SEC_GASKET, .subprog = 0, .level = PSP_BOTH | PSP_LVL2_AB },
diff --git a/util/amdfwtool/data_parse.c b/util/amdfwtool/data_parse.c
index 2f338309ed..8b6ecb70d1 100644
--- a/util/amdfwtool/data_parse.c
+++ b/util/amdfwtool/data_parse.c
@@ -179,9 +179,12 @@ static uint8_t find_register_fw_filename_psp_dir(char *fw_name, char *filename,
} else if (strcmp(fw_name, "PSP_SMUFW1_SUB0_FILE") == 0) {
fw_type = AMD_FW_PSP_SMU_FIRMWARE;
subprog = 0;
- } else if (strcmp(fw_name, "PSP_HW_IPCFG_FILE") == 0) {
+ } else if (strcmp(fw_name, "PSP_HW_IPCFG_FILE_SUB0") == 0) {
fw_type = AMD_HW_IPCFG;
subprog = 0;
+ } else if (strcmp(fw_name, "PSP_HW_IPCFG_FILE_SUB1") == 0) {
+ fw_type = AMD_HW_IPCFG;
+ subprog = 1;
} else if (strcmp(fw_name, "PSP_SMUFW1_SUB1_FILE") == 0) {
fw_type = AMD_FW_PSP_SMU_FIRMWARE;
subprog = 1;