[coreboot-gerrit] Change in coreboot[master]: amdfwtool:cezanne: Add entry of PSP_BOOTLOADER_AB (0x73)

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/50227 )

Change subject: amdfwtool:cezanne: Add entry of PSP_BOOTLOADER_AB (0x73)
......................................................................

amdfwtool:cezanne: Add entry of PSP_BOOTLOADER_AB (0x73)

Change-Id: Ie3577b403c1de7f20b6d5bcf9e1a5d47450266fe
Signed-off-by: Zheng Bao 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50227
Tested-by: build bot (Jenkins) 
Reviewed-by: Felix Held 
---
M src/soc/amd/cezanne/fw.cfg
M util/amdfwtool/amdfwtool.c
M util/amdfwtool/amdfwtool.h
M util/amdfwtool/data_parse.c
4 files changed, 6 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Held: Looks good to me, approved

diff --git a/src/soc/amd/cezanne/fw.cfg b/src/soc/amd/cezanne/fw.cfg
index 189bc9d..277707d 100644
--- a/src/soc/amd/cezanne/fw.cfg
+++ b/src/soc/amd/cezanne/fw.cfg
@@ -29,6 +29,7 @@
 KEYDB_TOS_FILE          TypeId0x51_KeyDbTos_CZN.sbin
 DMCUERAMDCN21_FILE      TypeId0x58_DmcuEramDcn21.sbin
 DMCUINTVECTORSDCN21_FILE  TypeId0x59_DmcuIntvectorsDcn21.sbin
+PSPBTLDR_AB_FILE        TypeId0x73_PspBootLoader_AB_CZN.sbin

# BDT
 PSP_PMUI_FILE1  TypeId0x64_Appb_CZN_1D_Lpddr4_Imem.csbin
diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index 8b54876..3d33d70 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -261,6 +261,7 @@
    { .type = AMD_FW_DMCU_ERAM, .level = PSP_LVL2 },
    { .type = AMD_FW_DMCU_ISR, .level = PSP_LVL2 },
    { .type = AMD_RPMC_NVRAM, .level = PSP_LVL2 },
+	{ .type = AMD_FW_PSP_BOOTLOADER_AB, .level = PSP_LVL2 },
    { .type = AMD_ABL0, .level = PSP_BOTH },
    { .type = AMD_ABL1, .level = PSP_BOTH },
    { .type = AMD_ABL2, .level = PSP_BOTH },
diff --git a/util/amdfwtool/amdfwtool.h b/util/amdfwtool/amdfwtool.h
index b12b989..c8e7ef4 100644
--- a/util/amdfwtool/amdfwtool.h
+++ b/util/amdfwtool/amdfwtool.h
@@ -47,6 +47,7 @@
    AMD_RPMC_NVRAM = 0x54,
    AMD_FW_DMCU_ERAM = 0x58,
    AMD_FW_DMCU_ISR = 0x59,
+	AMD_FW_PSP_BOOTLOADER_AB = 0x73,
    AMD_FW_IMC = 0x200,	/* Large enough to be larger than the top BHD entry type. */
    AMD_FW_GEC,
    AMD_FW_XHCI,
diff --git a/util/amdfwtool/data_parse.c b/util/amdfwtool/data_parse.c
index b6e14a8..80d8d01 100644
--- a/util/amdfwtool/data_parse.c
+++ b/util/amdfwtool/data_parse.c
@@ -244,6 +244,9 @@
    } else if (strcmp(fw_name, "RPMC_FILE") == 0) {
    	fw_type = AMD_RPMC_NVRAM;
    	subprog = 0;
+	} else if (strcmp(fw_name, "PSPBTLDR_AB_FILE") == 0) {
+		fw_type =  AMD_FW_PSP_BOOTLOADER_AB;
+		subprog = 0;
    } else {
    	fw_type = AMD_FW_INVALID;
    	/* TODO: Add more */