Kangheui Won has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/59581 )
Change subject: amdfwtool: remove duplicates ......................................................................
amdfwtool: remove duplicates
Remove duplicated condition check and entries from amdfwtool.
BUG=b:206909680 TEST=build guybrush and confirm amdfw and coreboot.rom are identical
Signed-off-by: Kangheui Won khwon@chromium.org Change-Id: I3b86e24ba1c2769985e2864528e4dfcbf3cccc4b --- M util/amdfwtool/amdfwtool.c M util/amdfwtool/data_parse.c 2 files changed, 0 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/59581/1
diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index ee360f0..957c81e 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -268,8 +268,6 @@ { .type = AMD_ABL5, .level = PSP_BOTH }, { .type = AMD_ABL6, .level = PSP_BOTH }, { .type = AMD_ABL7, .level = PSP_BOTH }, - { .type = AMD_FW_PSP_SMU_FIRMWARE, .subprog = 1, .level = PSP_BOTH }, - { .type = AMD_FW_PSP_SMU_FIRMWARE2, .subprog = 1, .level = PSP_BOTH }, { .type = AMD_FW_PSP_WHITELIST, .level = PSP_LVL2 }, { .type = AMD_FW_PSP_VERSTAGE, .level = PSP_BOTH }, { .type = AMD_FW_VERSTAGE_SIG, .level = PSP_BOTH }, diff --git a/util/amdfwtool/data_parse.c b/util/amdfwtool/data_parse.c index 8f93183..fccea94 100644 --- a/util/amdfwtool/data_parse.c +++ b/util/amdfwtool/data_parse.c @@ -132,9 +132,6 @@ } else if (strcmp(fw_name, "SMUSCS_FILE") == 0) { fw_type = AMD_FW_PSP_SMUSCS; subprog = 0; - } else if (strcmp(fw_name, "PSPTRUSTLETS_FILE") == 0) { - fw_type = AMD_FW_PSP_TRUSTLETS; - subprog = 0; } else if (strcmp(fw_name, "PSPSECUREDEBUG_FILE") == 0) { fw_type = AMD_FW_PSP_SECURED_DEBUG; subprog = 0;