[coreboot-gerrit] Change in coreboot[master]: amdfwtool: unify firmware names

[Kangheui Won (Code Review)]

Attention is currently required from: Jason Glenesk, Raul Rangel, Marshall Dawson, Felix Held.
Kangheui Won has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/59582 )

Change subject: amdfwtool: unify firmware names
......................................................................

amdfwtool: unify firmware names

Among stoneyridge, picasso, cezanne only picasso uses different name for
some firmware blobs. Unify them so amdfwtool can handle them in more
consistent manner.

BUG=b:206909680
TEST=boot on zork

Signed-off-by: Kangheui Won 
Change-Id: Idc3329374ec57ffc045b05ae9cb27bf4e735902f
---
M src/soc/amd/picasso/fw.cfg
M util/amdfwtool/data_parse.c
2 files changed, 3 insertions(+), 9 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/59582/1

diff --git a/src/soc/amd/picasso/fw.cfg b/src/soc/amd/picasso/fw.cfg
index 516af7b..0c89c88 100644
--- a/src/soc/amd/picasso/fw.cfg
+++ b/src/soc/amd/picasso/fw.cfg
@@ -11,7 +11,7 @@
 PSP_SMUFW2_SUB1_FILE   SmuFirmware2RV2.csbin
 PSP_SMUFW2_SUB2_FILE   SmuFirmware2PCO.csbin
 PSPSECUREOS_FILE       psp_os_combined_prod_RV.sbin
-PSP_SEC_DBG_KEY_FILE   RavenSecureDebug_PublicKey.bin
+PSPSECUREDEBUG_FILE    RavenSecureDebug_PublicKey.bin
 PSP_SEC_DEBUG_FILE     secure_unlock_prod_RV.sbin
 PSP_ABL0_FILE          AgesaBootloader0_prod_RV.csbin
 PSP_ABL1_FILE          AgesaBootloader1_prod_RV.csbin
@@ -27,7 +27,7 @@
 PSP_MP2FW1_FILE        MP2I2CFWRV2.sbin
 PSP_MP2FW2_FILE        MP2I2CFWPCO.sbin
 PSP_MP2CFG_FILE        MP2FWConfig.sbin
-PSP_DRIVERS_FILE       drv_sys_prod_RV.sbin
+AMD_DRIVER_ENTRIES     drv_sys_prod_RV.sbin
 # BDT
 PSP_PMUI_FILE1         Appb_Rv_1D_Ddr4_Udimm_Imem.csbin
 PSP_PMUI_FILE2         Appb_Rv_2D_Ddr4_Imem.csbin
diff --git a/util/amdfwtool/data_parse.c b/util/amdfwtool/data_parse.c
index fccea94..37e89ac 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, "PSPSECUREDEBUG_FILE") == 0) {
-		fw_type = AMD_FW_PSP_SECURED_DEBUG;
-		subprog = 0;
    } else if (strcmp(fw_name, "PSP_SMUFW1_SUB0_FILE") == 0) {
    	fw_type = AMD_FW_PSP_SMU_FIRMWARE;
    	subprog = 0;
@@ -156,7 +153,7 @@
    } else if (strcmp(fw_name, "PSP_SMUFW2_SUB2_FILE") == 0) {
    	fw_type = AMD_FW_PSP_SMU_FIRMWARE2;
    	subprog = 2;
-	} else if (strcmp(fw_name, "PSP_SEC_DBG_KEY_FILE") == 0) {
+	} else if (strcmp(fw_name, "PSPSECUREDEBUG_FILE") == 0) {
    	if (cb_config->unlock_secure) {
    		fw_type = AMD_FW_PSP_SECURED_DEBUG;
    		subprog = 0;
@@ -248,9 +245,6 @@
    	} else {
    		fw_type = AMD_FW_SKIP;
    	}
-	} else if (strcmp(fw_name, "PSP_DRIVERS_FILE") == 0) {
-		fw_type = AMD_DRIVER_ENTRIES;
-		subprog = 0;
    } else if (strcmp(fw_name, "PSP_S0I3_FILE") == 0) {
    	if (cb_config->s0i3) {
    		fw_type = AMD_S0I3_DRIVER;