From 1965f650eaa06affa6a2febe5b6cb302d3f981a1 Mon Sep 17 00:00:00 2001 From: Nikolai Vyssotski Date: Thu, 6 May 2021 22:15:36 -0500 Subject: amdfwtool:cezanne: use correct bootloader binary for whitelist support PSP whitelist bootloader (PSPBTLDR_WL_FILE) should be copied to type 0x73 entry and not type 0x01 (stage1 bootloader). We will also need to change WHL BL filename (Type0x01->Type0x73) in a separate CL. BUG=b:181135622 Change-Id: I71539a2065546547edc8a2621474cd1388b6434b Signed-off-by: Nikolai Vyssotski Reviewed-on: https://review.coreboot.org/c/coreboot/+/53892 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- util/amdfwtool/data_parse.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'util') diff --git a/util/amdfwtool/data_parse.c b/util/amdfwtool/data_parse.c index 0c2e71d94f..e17c2df97d 100644 --- a/util/amdfwtool/data_parse.c +++ b/util/amdfwtool/data_parse.c @@ -55,18 +55,14 @@ static uint8_t find_register_fw_filename_psp_dir(char *fw_name, char *filename, if (strcmp(fw_name, "PSPBTLDR_WL_FILE") == 0) { if (cb_config->have_whitelist == 1) { - fw_type = AMD_FW_PSP_BOOTLOADER; + fw_type = AMD_FW_PSP_BOOTLOADER_AB; subprog = 0; } else { fw_type = AMD_FW_SKIP; } } else if (strcmp(fw_name, "PSPBTLDR_FILE") == 0) { - if (cb_config->have_whitelist == 0) { - fw_type = AMD_FW_PSP_BOOTLOADER; - subprog = 0; - } else { - fw_type = AMD_FW_SKIP; - } + fw_type = AMD_FW_PSP_BOOTLOADER; + subprog = 0; } else if (strcmp(fw_name, "AMD_PUBKEY_FILE") == 0) { fw_type = AMD_FW_PSP_PUBKEY; subprog = 0; @@ -245,8 +241,12 @@ static uint8_t find_register_fw_filename_psp_dir(char *fw_name, char *filename, 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; + if (cb_config->have_whitelist == 0) { + fw_type = AMD_FW_PSP_BOOTLOADER_AB; + subprog = 0; + } else { + fw_type = AMD_FW_SKIP; + } } else { fw_type = AMD_FW_INVALID; /* TODO: Add more */ -- cgit v1.2.3