GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Nikolai Vyssotski 2021-05-06 22:15:36 -05:00 committed by Patrick Georgi
parent 7cf0ff45c6
commit 1965f650ea
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util/amdfwtool/data_parse.c
View File

@ -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 (strcmp(fw_name, "PSPBTLDR_WL_FILE") == 0) {
if (cb_config->have_whitelist == 1) { if (cb_config->have_whitelist == 1) {
fw_type = AMD_FW_PSP_BOOTLOADER; fw_type = AMD_FW_PSP_BOOTLOADER_AB;
subprog = 0; subprog = 0;
} else { } else {
fw_type = AMD_FW_SKIP; fw_type = AMD_FW_SKIP;
} }
} else if (strcmp(fw_name, "PSPBTLDR_FILE") == 0) { } else if (strcmp(fw_name, "PSPBTLDR_FILE") == 0) {
if (cb_config->have_whitelist == 0) {
fw_type = AMD_FW_PSP_BOOTLOADER; fw_type = AMD_FW_PSP_BOOTLOADER;
subprog = 0; subprog = 0;
} else {
fw_type = AMD_FW_SKIP;
}
} else if (strcmp(fw_name, "AMD_PUBKEY_FILE") == 0) { } else if (strcmp(fw_name, "AMD_PUBKEY_FILE") == 0) {
fw_type = AMD_FW_PSP_PUBKEY; fw_type = AMD_FW_PSP_PUBKEY;
subprog = 0; 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; fw_type = AMD_RPMC_NVRAM;
subprog = 0; subprog = 0;
} else if (strcmp(fw_name, "PSPBTLDR_AB_FILE") == 0) { } else if (strcmp(fw_name, "PSPBTLDR_AB_FILE") == 0) {
if (cb_config->have_whitelist == 0) {
fw_type = AMD_FW_PSP_BOOTLOADER_AB; fw_type = AMD_FW_PSP_BOOTLOADER_AB;
subprog = 0; subprog = 0;
} else {
fw_type = AMD_FW_SKIP;
}
} else { } else {
fw_type = AMD_FW_INVALID; fw_type = AMD_FW_INVALID;
/* TODO: Add more */ /* TODO: Add more */