Bao Zheng would like Zheng Bao to review this change.
AMD/SOC: Change FIRMWARE_LOCATE to FIRMWARE_LOCATION
Change-Id: I3a3d187fc24ab752dfe61893c15561a92d009fe2
Signed-off-by: Zheng Bao <fishbaozi@gmail.com>
---
M src/mainboard/google/zork/spd/Makefile.inc
M src/soc/amd/picasso/Makefile.inc
M src/soc/amd/picasso/fw.cfg
M src/soc/amd/stoneyridge/Makefile.inc
M src/soc/amd/stoneyridge/fw_cz.cfg
M src/soc/amd/stoneyridge/fw_st.cfg
M src/southbridge/amd/pi/hudson/Makefile.inc
M src/southbridge/amd/pi/hudson/fw_avl.cfg
M util/amdfwtool/data_parse.c
9 files changed, 33 insertions(+), 33 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/62/46062/1
diff --git a/src/mainboard/google/zork/spd/Makefile.inc b/src/mainboard/google/zork/spd/Makefile.inc
index 1042d91..d6ae475 100644
--- a/src/mainboard/google/zork/spd/Makefile.inc
+++ b/src/mainboard/google/zork/spd/Makefile.inc
@@ -6,7 +6,7 @@
APCB_SOURCES=$(foreach f, $(basename $(SPD_SOURCES)), $(obj)/APCB_$(f).gen)
# APCB binary with magic numbers to be replaced by apcb_edit tool
-APCB_MAGIC_BLOB:=$(FIRMWARE_LOCATE)/APCB_magic.bin
+APCB_MAGIC_BLOB:=$(FIRMWARE_LOCATION)/APCB_magic.bin
$(obj)/APCB_%.gen: $(SPD_SOURCES_DIR)/%.hex \
$(APCB_EDIT_TOOL) \
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index 44145b2..5779072 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -122,7 +122,7 @@
# Design Guide for AMD Family 17h Processors" (PID #55758, NDA only).
#
-FIRMWARE_LOCATE=$(shell grep -e FIRMWARE_LOCATE $(CONFIG_AMDFW_CONFIG_FILE) | awk '{print $$2}')
+FIRMWARE_LOCATION=$(shell grep -e FIRMWARE_LOCATION $(CONFIG_AMDFW_CONFIG_FILE) | awk '{print $$2}')
ifeq ($(CONFIG_PSP_UNLOCK_SECURE_DEBUG),y)
# Enable secure debug unlock
@@ -172,9 +172,9 @@
APOB_NV_BASE=$(shell grep "FMAP_SECTION_RW_MRC_CACHE_START" $(obj)/fmap_config.h | awk '{print $$(NF)}')
# type = 0x66
-PSP_UCODE_FILE1=$(FIRMWARE_LOCATE)/UcodePatch_PCO_B1.bin
-PSP_UCODE_FILE2=$(FIRMWARE_LOCATE)/UcodePatch_PCO_B0.bin
-PSP_UCODE_FILE3=$(FIRMWARE_LOCATE)/UcodePatch_RV2_A0.bin
+PSP_UCODE_FILE1=$(FIRMWARE_LOCATION)/UcodePatch_PCO_B1.bin
+PSP_UCODE_FILE2=$(FIRMWARE_LOCATION)/UcodePatch_PCO_B0.bin
+PSP_UCODE_FILE3=$(FIRMWARE_LOCATION)/UcodePatch_RV2_A0.bin
ifeq ($(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),y)
# type = 0x6B - PSP Shared memory location
diff --git a/src/soc/amd/picasso/fw.cfg b/src/soc/amd/picasso/fw.cfg
index e746d1e..516af7b 100644
--- a/src/soc/amd/picasso/fw.cfg
+++ b/src/soc/amd/picasso/fw.cfg
@@ -1,6 +1,6 @@
# PSP fw config file
-FIRMWARE_LOCATE 3rdparty/amd_blobs/picasso/PSP
+FIRMWARE_LOCATION 3rdparty/amd_blobs/picasso/PSP
# type file
AMD_PUBKEY_FILE AmdPubKeyRV.bin
diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc
index 16b8326..096b1b8 100644
--- a/src/soc/amd/stoneyridge/Makefile.inc
+++ b/src/soc/amd/stoneyridge/Makefile.inc
@@ -102,9 +102,9 @@
### 0
-FIRMWARE_LOCATE=$(shell grep -e FIRMWARE_LOCATE $(CONFIG_AMDFW_CONFIG_FILE) | awk '{print $$2}')
+FIRMWARE_LOCATION=$(shell grep -e FIRMWARE_LOCATION $(CONFIG_AMDFW_CONFIG_FILE) | awk '{print $$2}')
-ifneq ($(FIRMWARE_LOCATE),)
+ifneq ($(FIRMWARE_LOCATION),)
ifeq ($(CONFIG_AMD_APU_STONEYRIDGE),y)
FIRMWARE_TYPE=ST
@@ -126,11 +126,11 @@
OPT_STONEYRIDGE_XHCI_FWM_FILE=$(call add_opt_prefix, $(CONFIG_STONEYRIDGE_XHCI_FWM_FILE), --xhci)
OPT_STONEYRIDGE_GEC_FWM_FILE=$(call add_opt_prefix, $(CONFIG_STONEYRIDGE_GEC_FWM_FILE), --gec)
-SMUFWM_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware_$(FIRMWARE_TYPE).csbin
-SMUFWM_FN_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware_$(FIRMWARE_TYPE)_FN.csbin
+SMUFWM_FILE=$(top)/$(FIRMWARE_LOCATION)/SmuFirmware_$(FIRMWARE_TYPE).csbin
+SMUFWM_FN_FILE=$(top)/$(FIRMWARE_LOCATION)/SmuFirmware_$(FIRMWARE_TYPE)_FN.csbin
ifeq ("$(wildcard $(SMUFWM_FILE))","")
-SMUFWM_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware$(FIRMWARE_TYPE).sbin
-SMUFWM_FN_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware$(FIRMWARE_TYPE)_FN.sbin
+SMUFWM_FILE=$(top)/$(FIRMWARE_LOCATION)/SmuFirmware$(FIRMWARE_TYPE).sbin
+SMUFWM_FN_FILE=$(top)/$(FIRMWARE_LOCATION)/SmuFirmware$(FIRMWARE_TYPE)_FN.sbin
endif
ifeq ($(FIRMWARE_TYPE),ST)
@@ -203,7 +203,7 @@
endif # ifeq ($(CONFIG_SOC_AMD_PSP_SELECTABLE_SMU_FW),y)
-else # ifneq ($(FIRMWARE_LOCATE),)
+else # ifneq ($(FIRMWARE_LOCATION),)
warn_no_amdfw:
printf "\n\t** WARNING **\n"
@@ -214,6 +214,6 @@
files_added:: warn_no_amdfw
-endif # ifneq ($(FIRMWARE_LOCATE),)
+endif # ifneq ($(FIRMWARE_LOCATION),)
endif # ($(CONFIG_SOC_AMD_STONEYRIDGE),y)
diff --git a/src/soc/amd/stoneyridge/fw_cz.cfg b/src/soc/amd/stoneyridge/fw_cz.cfg
index acbf136..a6a22f7 100644
--- a/src/soc/amd/stoneyridge/fw_cz.cfg
+++ b/src/soc/amd/stoneyridge/fw_cz.cfg
@@ -1,6 +1,6 @@
# PSP fw config file
-FIRMWARE_LOCATE 3rdparty/amd_blobs/stoneyridge/PSP/CZ
+FIRMWARE_LOCATION 3rdparty/amd_blobs/stoneyridge/PSP/CZ
#PSP
AMD_PUBKEY_FILE AmdPubKeyCZ.bin
PSPBTLDR_FILE PspBootLoader_prod_CZ.sbin
diff --git a/src/soc/amd/stoneyridge/fw_st.cfg b/src/soc/amd/stoneyridge/fw_st.cfg
index aa02668..01db8b9 100644
--- a/src/soc/amd/stoneyridge/fw_st.cfg
+++ b/src/soc/amd/stoneyridge/fw_st.cfg
@@ -1,6 +1,6 @@
# PSP fw config file
-FIRMWARE_LOCATE 3rdparty/amd_blobs/stoneyridge/PSP/ST
+FIRMWARE_LOCATION 3rdparty/amd_blobs/stoneyridge/PSP/ST
#XHCI_FWM_FILE xhci.bin
#PSP
diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc
index 0c06ee2..9792bec 100644
--- a/src/southbridge/amd/pi/hudson/Makefile.inc
+++ b/src/southbridge/amd/pi/hudson/Makefile.inc
@@ -78,29 +78,29 @@
ifeq ($(CONFIG_HUDSON_PSP), y)
ifeq ($(CONFIG_CPU_AMD_PI_00730F01), y)
-FIRMWARE_LOCATE=$(shell grep -e FIRMWARE_LOCATE $(CONFIG_AMDFW_CONFIG_FILE) | awk '{print $$2}')
+FIRMWARE_LOCATION=$(shell grep -e FIRMWARE_LOCATION $(CONFIG_AMDFW_CONFIG_FILE) | awk '{print $$2}')
FIRMWARE_TYPE=
endif
ifeq ($(CONFIG_CPU_AMD_PI_00660F01), y)
-FIRMWARE_LOCATE=$(dir $(call strip_quotes, $(CONFIG_AMD_PUBKEY_FILE)))
+FIRMWARE_LOCATION=$(dir $(call strip_quotes, $(CONFIG_AMD_PUBKEY_FILE)))
FIRMWARE_TYPE=CZ
-PSPBTLDR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspBootLoader_prod_CZ.sbin
-PSPRCVR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspRecoveryBootLoader_prod_CZ.sbin
-PSPSECUREOS_FILE=$(top)/$(FIRMWARE_LOCATE)/PspSecureOs_prod_CZ.csbin
-PSPTRUSTLETS_FILE=$(top)/$(FIRMWARE_LOCATE)/PspTrustlets_prod_CZ.cbin
-TRUSTLETKEY_FILE=$(top)/$(FIRMWARE_LOCATE)/TrustletKey_prod_CZ.sbin
-SMUFIRMWARE2_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware2_prod_CZ.sbin
+PSPBTLDR_FILE=$(top)/$(FIRMWARE_LOCATION)/PspBootLoader_prod_CZ.sbin
+PSPRCVR_FILE=$(top)/$(FIRMWARE_LOCATION)/PspRecoveryBootLoader_prod_CZ.sbin
+PSPSECUREOS_FILE=$(top)/$(FIRMWARE_LOCATION)/PspSecureOs_prod_CZ.csbin
+PSPTRUSTLETS_FILE=$(top)/$(FIRMWARE_LOCATION)/PspTrustlets_prod_CZ.cbin
+TRUSTLETKEY_FILE=$(top)/$(FIRMWARE_LOCATION)/TrustletKey_prod_CZ.sbin
+SMUFIRMWARE2_FILE=$(top)/$(FIRMWARE_LOCATION)/SmuFirmware2_prod_CZ.sbin
endif
-#PUBSIGNEDKEY_FILE=$(top)/$(FIRMWARE_LOCATE)/RtmPubSigned$(FIRMWARE_TYPE).key
-#PSPNVRAM_FILE=$(top)/$(FIRMWARE_LOCATE)/PspNvram$(FIRMWARE_TYPE).bin
-#SMUFWM_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware$(FIRMWARE_TYPE).sbin
-#SMUFWM_FN_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware$(FIRMWARE_TYPE)_FN.sbin
-#SMUSCS_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuScs$(FIRMWARE_TYPE).bin
-#PSPSECUREDEBUG_FILE=$(top)/$(FIRMWARE_LOCATE)/PspSecureDebug$(FIRMWARE_TYPE).Key
+#PUBSIGNEDKEY_FILE=$(top)/$(FIRMWARE_LOCATION)/RtmPubSigned$(FIRMWARE_TYPE).key
+#PSPNVRAM_FILE=$(top)/$(FIRMWARE_LOCATION)/PspNvram$(FIRMWARE_TYPE).bin
+#SMUFWM_FILE=$(top)/$(FIRMWARE_LOCATION)/SmuFirmware$(FIRMWARE_TYPE).sbin
+#SMUFWM_FN_FILE=$(top)/$(FIRMWARE_LOCATION)/SmuFirmware$(FIRMWARE_TYPE)_FN.sbin
+#SMUSCS_FILE=$(top)/$(FIRMWARE_LOCATION)/SmuScs$(FIRMWARE_TYPE).bin
+#PSPSECUREDEBUG_FILE=$(top)/$(FIRMWARE_LOCATION)/PspSecureDebug$(FIRMWARE_TYPE).Key
endif
diff --git a/src/southbridge/amd/pi/hudson/fw_avl.cfg b/src/southbridge/amd/pi/hudson/fw_avl.cfg
index 510d6ae..eb3fac3 100644
--- a/src/southbridge/amd/pi/hudson/fw_avl.cfg
+++ b/src/southbridge/amd/pi/hudson/fw_avl.cfg
@@ -1,6 +1,6 @@
# PSP fw config file
-FIRMWARE_LOCATE 3rdparty/blobs/southbridge/amd/avalon/PSP
+FIRMWARE_LOCATION 3rdparty/blobs/southbridge/amd/avalon/PSP
#PSP
AMD_PUBKEY_FILE AmdPubKey.bin
PSPBTLDR_FILE PspBootLoader.Bypass.sbin
diff --git a/util/amdfwtool/data_parse.c b/util/amdfwtool/data_parse.c
index d55b0cc..d1af9e1 100644
--- a/util/amdfwtool/data_parse.c
+++ b/util/amdfwtool/data_parse.c
@@ -312,7 +312,7 @@
entries_line_regex, &entries_line_expr);
/* Get a line */
- /* Get FIRMWARE_LOCATE in the first loop */
+ /* Get FIRMWARE_LOCATION in the first loop */
while (get_input_file_line(config, oneline, MAX_LINE_SIZE) == OK) {
/* get line */
/* blank comment */
@@ -328,7 +328,7 @@
/* no match */
continue;
}
- if (strcmp(&(oneline[match[1].rm_so]), "FIRMWARE_LOCATE") == 0) {
+ if (strcmp(&(oneline[match[1].rm_so]), "FIRMWARE_LOCATION") == 0) {
strcpy(dir, &(oneline[match[2].rm_so]));
break;
}
To view, visit change 46062. To unsubscribe, or for help writing mail filters, visit settings.