sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/amd: Change FIRMWARE_LOCATE to FIRMWARE_LOCATION

Browse Source 
Change-Id: I3a3d187fc24ab752dfe61893c15561a92d009fe2
Signed-off-by: Zheng Bao <fishbaozi@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46062
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Zheng Bao
2020-10-06 12:03:11 +08:00
committed by Patrick Georgi
parent 77a2c67dfe
commit 3384e4a709
9 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mainboard/google/zork/spd/Makefile.inc
View File

@ -6,7 +6,7 @@ SPD_SOURCES_DIR := src/mainboard/$(MAINBOARDDIR)/spd
APCB_SOURCES=$(foreach f, $(basename $(SPD_SOURCES)), $(obj)/APCB_$(f).gen) APCB_SOURCES=$(foreach f, $(basename $(SPD_SOURCES)), $(obj)/APCB_$(f).gen)
# APCB binary with magic numbers to be replaced by apcb_edit tool # 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 \ $(obj)/APCB_%.gen: $(SPD_SOURCES_DIR)/%.hex \
$(APCB_EDIT_TOOL) \ $(APCB_EDIT_TOOL) \

8
src/soc/amd/picasso/Makefile.inc
View File

@ -130,7 +130,7 @@ PICASSO_FWM_POSITION=$(call int-add, \
# Design Guide for AMD Family 17h Processors" (PID #55758, NDA only). # 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) ifeq ($(CONFIG_PSP_UNLOCK_SECURE_DEBUG),y)
# Enable secure debug unlock # Enable secure debug unlock
@ -180,9 +180,9 @@ APOB_NV_SIZE=$(shell grep "FMAP_SECTION_RW_MRC_CACHE_SIZE" $(obj)/fmap_config.h
APOB_NV_BASE=$(shell grep "FMAP_SECTION_RW_MRC_CACHE_START" $(obj)/fmap_config.h | awk '{print $$(NF)}') APOB_NV_BASE=$(shell grep "FMAP_SECTION_RW_MRC_CACHE_START" $(obj)/fmap_config.h | awk '{print $$(NF)}')
# type = 0x66 # type = 0x66
PSP_UCODE_FILE1=$(FIRMWARE_LOCATE)/UcodePatch_PCO_B1.bin PSP_UCODE_FILE1=$(FIRMWARE_LOCATION)/UcodePatch_PCO_B1.bin
PSP_UCODE_FILE2=$(FIRMWARE_LOCATE)/UcodePatch_PCO_B0.bin PSP_UCODE_FILE2=$(FIRMWARE_LOCATION)/UcodePatch_PCO_B0.bin
PSP_UCODE_FILE3=$(FIRMWARE_LOCATE)/UcodePatch_RV2_A0.bin PSP_UCODE_FILE3=$(FIRMWARE_LOCATION)/UcodePatch_RV2_A0.bin
ifeq ($(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),y) ifeq ($(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),y)
# type = 0x6B - PSP Shared memory location # type = 0x6B - PSP Shared memory location

2
src/soc/amd/picasso/fw.cfg
View File

@ -1,6 +1,6 @@
# PSP fw config file # PSP fw config file
FIRMWARE_LOCATE 3rdparty/amd_blobs/picasso/PSP FIRMWARE_LOCATION 3rdparty/amd_blobs/picasso/PSP
# type file # type file
AMD_PUBKEY_FILE AmdPubKeyRV.bin AMD_PUBKEY_FILE AmdPubKeyRV.bin

16
src/soc/amd/stoneyridge/Makefile.inc
View File

@ -102,9 +102,9 @@ STONEYRIDGE_FWM_POSITION=$(call int-add, \
### 0 ### 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) ifeq ($(CONFIG_AMD_APU_STONEYRIDGE),y)
FIRMWARE_TYPE=ST FIRMWARE_TYPE=ST
@ -126,11 +126,11 @@ add_opt_prefix=$(if $(call strip_quotes, $(1)), $(2) $(call strip_quotes, $(1)),
OPT_STONEYRIDGE_XHCI_FWM_FILE=$(call add_opt_prefix, $(CONFIG_STONEYRIDGE_XHCI_FWM_FILE), --xhci) 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) OPT_STONEYRIDGE_GEC_FWM_FILE=$(call add_opt_prefix, $(CONFIG_STONEYRIDGE_GEC_FWM_FILE), --gec)
SMUFWM_FILE=$(top)/$(FIRMWARE_LOCATE)/$(shell awk '($$1=="PSP_SMUFW1_SUB0_FILE") {print $$2}' $(CONFIG_AMDFW_CONFIG_FILE)) SMUFWM_FILE=$(top)/$(FIRMWARE_LOCATION)/$(shell awk '($$1=="PSP_SMUFW1_SUB0_FILE") {print $$2}' $(CONFIG_AMDFW_CONFIG_FILE))
SMUFWM_FN_FILE=$(top)/$(FIRMWARE_LOCATE)/$(shell awk '($$1=="PSP_SMUFW1_SUB1_FILE") {print $$2}' $(CONFIG_AMDFW_CONFIG_FILE)) SMUFWM_FN_FILE=$(top)/$(FIRMWARE_LOCATION)/$(shell awk '($$1=="PSP_SMUFW1_SUB1_FILE") {print $$2}' $(CONFIG_AMDFW_CONFIG_FILE))
SMUFIRMWARE2_FILE=$(top)/$(FIRMWARE_LOCATE)/$(shell awk '($$1=="PSP_SMUFW2_SUB0_FILE") {print $$2}' $(CONFIG_AMDFW_CONFIG_FILE)) SMUFIRMWARE2_FILE=$(top)/$(FIRMWARE_LOCATION)/$(shell awk '($$1=="PSP_SMUFW2_SUB0_FILE") {print $$2}' $(CONFIG_AMDFW_CONFIG_FILE))
SMUFIRMWARE2_FN_FILE=$(top)/$(FIRMWARE_LOCATE)/$(shell awk '($$1=="PSP_SMUFW2_SUB1_FILE") {print $$2}' $(CONFIG_AMDFW_CONFIG_FILE)) SMUFIRMWARE2_FN_FILE=$(top)/$(FIRMWARE_LOCATION)/$(shell awk '($$1=="PSP_SMUFW2_SUB1_FILE") {print $$2}' $(CONFIG_AMDFW_CONFIG_FILE))
ifeq ("$(wildcard $(SMUFWM_FN_FILE))","") ifeq ("$(wildcard $(SMUFWM_FN_FILE))","")
SMUFWM_FN_FILE= SMUFWM_FN_FILE=
@ -211,7 +211,7 @@ endif
endif # ifeq ($(CONFIG_SOC_AMD_PSP_SELECTABLE_SMU_FW),y) endif # ifeq ($(CONFIG_SOC_AMD_PSP_SELECTABLE_SMU_FW),y)
else # ifneq ($(FIRMWARE_LOCATE),) else # ifneq ($(FIRMWARE_LOCATION),)
warn_no_amdfw: warn_no_amdfw:
printf "\n\t** WARNING **\n" printf "\n\t** WARNING **\n"
@ -222,6 +222,6 @@ PHONY+=warn_no_amdfw
files_added:: warn_no_amdfw files_added:: warn_no_amdfw
endif # ifneq ($(FIRMWARE_LOCATE),) endif # ifneq ($(FIRMWARE_LOCATION),)
endif # ($(CONFIG_SOC_AMD_STONEYRIDGE),y) endif # ($(CONFIG_SOC_AMD_STONEYRIDGE),y)

2
src/soc/amd/stoneyridge/fw_cz.cfg
View File

@ -1,6 +1,6 @@
# PSP fw config file # PSP fw config file
FIRMWARE_LOCATE 3rdparty/amd_blobs/stoneyridge/PSP/CZ FIRMWARE_LOCATION 3rdparty/amd_blobs/stoneyridge/PSP/CZ
#PSP #PSP
AMD_PUBKEY_FILE AmdPubKeyCZ.bin AMD_PUBKEY_FILE AmdPubKeyCZ.bin
PSPBTLDR_FILE PspBootLoader_prod_CZ.sbin PSPBTLDR_FILE PspBootLoader_prod_CZ.sbin

2
src/soc/amd/stoneyridge/fw_st.cfg
View File

@ -1,6 +1,6 @@
# PSP fw config file # 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 #XHCI_FWM_FILE xhci.bin
#PSP #PSP

22
src/southbridge/amd/pi/hudson/Makefile.inc
View File

@ -78,26 +78,26 @@ endif
ifeq ($(CONFIG_HUDSON_PSP), y) ifeq ($(CONFIG_HUDSON_PSP), y)
ifeq ($(CONFIG_CPU_AMD_PI_00730F01), 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= FIRMWARE_TYPE=
endif endif
ifeq ($(CONFIG_CPU_AMD_PI_00660F01), y) 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 FIRMWARE_TYPE=CZ
PSPBTLDR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspBootLoader_prod_CZ.sbin PSPBTLDR_FILE=$(top)/$(FIRMWARE_LOCATION)/PspBootLoader_prod_CZ.sbin
PSPRCVR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspRecoveryBootLoader_prod_CZ.sbin PSPRCVR_FILE=$(top)/$(FIRMWARE_LOCATION)/PspRecoveryBootLoader_prod_CZ.sbin
PSPSECUREOS_FILE=$(top)/$(FIRMWARE_LOCATE)/PspSecureOs_prod_CZ.csbin PSPSECUREOS_FILE=$(top)/$(FIRMWARE_LOCATION)/PspSecureOs_prod_CZ.csbin
PSPTRUSTLETS_FILE=$(top)/$(FIRMWARE_LOCATE)/PspTrustlets_prod_CZ.cbin PSPTRUSTLETS_FILE=$(top)/$(FIRMWARE_LOCATION)/PspTrustlets_prod_CZ.cbin
TRUSTLETKEY_FILE=$(top)/$(FIRMWARE_LOCATE)/TrustletKey_prod_CZ.sbin TRUSTLETKEY_FILE=$(top)/$(FIRMWARE_LOCATION)/TrustletKey_prod_CZ.sbin
SMUFIRMWARE2_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware2_prod_CZ.sbin SMUFIRMWARE2_FILE=$(top)/$(FIRMWARE_LOCATION)/SmuFirmware2_prod_CZ.sbin
endif endif
#PUBSIGNEDKEY_FILE=$(top)/$(FIRMWARE_LOCATE)/RtmPubSigned$(FIRMWARE_TYPE).key #PUBSIGNEDKEY_FILE=$(top)/$(FIRMWARE_LOCATION)/RtmPubSigned$(FIRMWARE_TYPE).key
#PSPNVRAM_FILE=$(top)/$(FIRMWARE_LOCATE)/PspNvram$(FIRMWARE_TYPE).bin #PSPNVRAM_FILE=$(top)/$(FIRMWARE_LOCATION)/PspNvram$(FIRMWARE_TYPE).bin
#PSPSECUREDEBUG_FILE=$(top)/$(FIRMWARE_LOCATE)/PspSecureDebug$(FIRMWARE_TYPE).Key #PSPSECUREDEBUG_FILE=$(top)/$(FIRMWARE_LOCATION)/PspSecureDebug$(FIRMWARE_TYPE).Key
endif endif

2
src/southbridge/amd/pi/hudson/fw_avl.cfg
View File

@ -1,6 +1,6 @@
# PSP fw config file # PSP fw config file
FIRMWARE_LOCATE 3rdparty/blobs/southbridge/amd/avalon/PSP FIRMWARE_LOCATION 3rdparty/blobs/southbridge/amd/avalon/PSP
#PSP #PSP
AMD_PUBKEY_FILE AmdPubKey.bin AMD_PUBKEY_FILE AmdPubKey.bin
PSPBTLDR_FILE PspBootLoader.Bypass.sbin PSPBTLDR_FILE PspBootLoader.Bypass.sbin

6
util/amdfwtool/data_parse.c
View File

@ -359,13 +359,13 @@ uint8_t process_config(FILE *config, amd_cb_config *cb_config, uint8_t print_dep
entries_line_regex, &entries_line_expr); entries_line_regex, &entries_line_expr);
/* Get a line */ /* 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) { while (get_input_file_line(config, oneline, MAX_LINE_SIZE) == OK) {
/* get a line */ /* get a line */
if (skip_comment_blank_line(oneline)) if (skip_comment_blank_line(oneline))
continue; continue;
if (is_valid_entry(oneline, match)) { if (is_valid_entry(oneline, match)) {
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])); strcpy(dir, &(oneline[match[2].rm_so]));
break; break;
} }
@ -384,7 +384,7 @@ uint8_t process_config(FILE *config, amd_cb_config *cb_config, uint8_t print_dep
if (skip_comment_blank_line(oneline)) if (skip_comment_blank_line(oneline))
continue; continue;
if (is_valid_entry(oneline, match)) { if (is_valid_entry(oneline, match)) {
if (strcmp(&(oneline[match[1].rm_so]), "FIRMWARE_LOCATE") == 0) { if (strcmp(&(oneline[match[1].rm_so]), "FIRMWARE_LOCATION") == 0) {
continue; continue;
} else { } else {
path_filename = malloc(MAX_LINE_SIZE); path_filename = malloc(MAX_LINE_SIZE);