Change in coreboot[master]: util/amdfwtool: Add IKEK key for Trusted Application

[Felix Held (Code Review)]

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

Change subject: util/amdfwtool: Add IKEK key for Trusted Application
......................................................................

util/amdfwtool: Add IKEK key for Trusted Application

This binary file is required for use by Trusted Applications that
execute in PSP.

BUG=b:229947314
TEST=Build and boot to OS in Skyrim.

Change-Id: I2d05792cfd98fa9c38f5deef1ac3282625983eeb
Signed-off-by: Karthikeyan Ramasubramanian 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/64040
Tested-by: build bot (Jenkins) 
Reviewed-by: Raul Rangel 
Reviewed-by: Felix Held 
---
M util/amdfwtool/amdfwtool.c
M util/amdfwtool/amdfwtool.h
M util/amdfwtool/data_parse.c
3 files changed, 5 insertions(+), 0 deletions(-)

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

diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index 3273b72..c58d1e9 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -265,6 +265,7 @@
    { .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_TA_IKEK, .level = PSP_BOTH | PSP_LVL2_AB },
    { .type = AMD_ABL0, .level = PSP_BOTH | PSP_LVL2_AB },
    { .type = AMD_ABL1, .level = PSP_BOTH | PSP_LVL2_AB },
    { .type = AMD_ABL2, .level = PSP_BOTH | PSP_LVL2_AB },
diff --git a/util/amdfwtool/amdfwtool.h b/util/amdfwtool/amdfwtool.h
index cc0a3b1..0bef43a 100644
--- a/util/amdfwtool/amdfwtool.h
+++ b/util/amdfwtool/amdfwtool.h
@@ -58,6 +58,7 @@
    AMD_FW_SPIROM_CFG = 0x5c,
    AMD_FW_DMCUB = 0x71,
    AMD_FW_PSP_BOOTLOADER_AB = 0x73,
+	AMD_TA_IKEK = 0x8d,
    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 a080eec..14c15673 100644
--- a/util/amdfwtool/data_parse.c
+++ b/util/amdfwtool/data_parse.c
@@ -328,6 +328,9 @@
    	} else {
    		fw_type = AMD_FW_SKIP;
    	}
+	} else if (strcmp(fw_name, "TA_IKEK_FILE") == 0) {
+		fw_type = AMD_TA_IKEK;
+		subprog = 0;
    } else {
    	fw_type = AMD_FW_INVALID;
    	/* TODO: Add more */