diff options
| author | Zheng Bao <fishbaozi@gmail.com> | 2021-11-03 10:24:15 +0800 |
|---|---|---|
| committer | Werner Zeh <werner.zeh@siemens.com> | 2021-11-15 10:06:39 +0000 |
| commit | 6bc300d8d5eeec4315fe25c78b5ac535e7a4a907 (patch) | |
| tree | 8540da7105b3fbce6963ac0720b96348d603d5e0 | |
| parent | cbbb02777cd723eb71f952569517cccda94167e7 (diff) | |
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>
| -rw-r--r-- | src/soc/amd/stoneyridge/Makefile.inc | 2 | ||||
| -rw-r--r-- | util/amdfwtool/amdfwtool.c | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc index fd3ebf7a66..d265651061 100644 --- a/src/soc/amd/stoneyridge/Makefile.inc +++ b/src/soc/amd/stoneyridge/Makefile.inc @@ -123,6 +123,7 @@ endif ifeq ($(FIRMWARE_TYPE),ST) OPT_COMBOCAPABLE=--combo-capable +OPT_SOCNAME=--soc-name "Stoneyridge" endif ifeq ($(CONFIG_USE_PSPSECUREOS),y) @@ -147,6 +148,7 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(CONFIG_STONEYRIDGE_XHCI_FWM_FILE)) \ $(OPT_COMBOCAPABLE)\ $(OPT_PSP_USE_PSPSECUREOS) \ --config $(CONFIG_AMDFW_CONFIG_FILE) \ + $(OPT_SOCNAME) \ --flashsize $(CONFIG_ROM_SIZE) \ --location $(shell printf "0x%x" $(STONEYRIDGE_FWM_POSITION)) \ --output $@ diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index b10315ebf8..ee360f0df4 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -1586,11 +1586,13 @@ int main(int argc, char **argv) amd_romsig->xhci_entry = 0; if (soc_id != PLATFORM_UNKNOWN) { - retval = set_efs_table(soc_id, amd_romsig, efs_spi_readmode, - efs_spi_speed, efs_spi_micron_flag); - if (retval) { - fprintf(stderr, "ERROR: Failed to initialize EFS table!\n"); - return retval; + if (soc_id != PLATFORM_STONEYRIDGE) { + retval = set_efs_table(soc_id, amd_romsig, efs_spi_readmode, + efs_spi_speed, efs_spi_micron_flag); + if (retval) { + fprintf(stderr, "ERROR: Failed to initialize EFS table!\n"); + return retval; + } } } else { fprintf(stderr, "WARNING: No SOC name specified.\n"); |