diff options
| author | Nikolai Vyssotski <nikolai.vyssotski@amd.corp-partner.google.com> | 2021-05-06 22:15:36 -0500 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-05-18 10:00:13 +0000 |
| commit | 1965f650eaa06affa6a2febe5b6cb302d3f981a1 (patch) | |
| tree | c2de89ffcf9005a153d6fc0fe7d8c31fb3659ba4 | |
| parent | 7cf0ff45c69eb3dbb49d27535c8a33a264a0d3aa (diff) | |
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 <nikolai.vyssotski@amd.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/53892
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
| -rw-r--r-- | util/amdfwtool/data_parse.c | 18 |
1 files changed, 9 insertions, 9 deletions
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 */ |