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

amdfwtool: Set soc name for Stoneyridge 

For the stoneyridge, soc_name is not set in Makefile, so set_efs_table
is not called. Keep it unchanged.

Change-Id: I0e82188ce64733420a578446e22a077ef789be92
Signed-off-by: Zheng Bao <fishbaozi@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58555
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Zheng Bao 2021-11-03 10:24:15 +08:00 committed by Werner Zeh
parent cbbb02777c
commit 6bc300d8d5
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,6 +123,7 @@ endif
ifeq ($(FIRMWARE_TYPE),ST) ifeq ($(FIRMWARE_TYPE),ST)
OPT_COMBOCAPABLE=--combo-capable OPT_COMBOCAPABLE=--combo-capable
OPT_SOCNAME=--soc-name "Stoneyridge"
endif endif
ifeq ($(CONFIG_USE_PSPSECUREOS),y) ifeq ($(CONFIG_USE_PSPSECUREOS),y)
@ -147,6 +148,7 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(CONFIG_STONEYRIDGE_XHCI_FWM_FILE)) \
$(OPT_COMBOCAPABLE)\ $(OPT_COMBOCAPABLE)\
$(OPT_PSP_USE_PSPSECUREOS) \ $(OPT_PSP_USE_PSPSECUREOS) \
--config $(CONFIG_AMDFW_CONFIG_FILE) \ --config $(CONFIG_AMDFW_CONFIG_FILE) \
$(OPT_SOCNAME) \
--flashsize $(CONFIG_ROM_SIZE) \ --flashsize $(CONFIG_ROM_SIZE) \
--location $(shell printf "0x%x" $(STONEYRIDGE_FWM_POSITION)) \ --location $(shell printf "0x%x" $(STONEYRIDGE_FWM_POSITION)) \
--output $@ --output $@

2
util/amdfwtool/amdfwtool.c
View File

@ -1586,12 +1586,14 @@ int main(int argc, char **argv)
amd_romsig->xhci_entry = 0; amd_romsig->xhci_entry = 0;
if (soc_id != PLATFORM_UNKNOWN) { if (soc_id != PLATFORM_UNKNOWN) {
if (soc_id != PLATFORM_STONEYRIDGE) {
retval = set_efs_table(soc_id, amd_romsig, efs_spi_readmode, retval = set_efs_table(soc_id, amd_romsig, efs_spi_readmode,
efs_spi_speed, efs_spi_micron_flag); efs_spi_speed, efs_spi_micron_flag);
if (retval) { if (retval) {
fprintf(stderr, "ERROR: Failed to initialize EFS table!\n"); fprintf(stderr, "ERROR: Failed to initialize EFS table!\n");
return retval; return retval;
} }
}
} else { } else {
fprintf(stderr, "WARNING: No SOC name specified.\n"); fprintf(stderr, "WARNING: No SOC name specified.\n");
} }