diff options
| author | Zheng Bao <fishbaozi@gmail.com> | 2023-02-11 22:13:36 +0800 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2023-02-14 18:24:08 +0000 |
| commit | 4bfb36ed68154d8ee6fc77a6b2bf79938cae9e8a (patch) | |
| tree | 17d6a1dc6900148d3f5a8bcdd32a43619e1d390a /src | |
| parent | af69de494e2c32140ce5e00a1562c2845345b1bf (diff) | |
amdfwtool: use SoC ID info instead of misleading comboable flag
Since it actually depends on the SoC type whether the old PSP
directory table pointer or the new comboable PSP directory table
pointer is used in EFS, get this information from the SoC ID instead
of passing the comboable flag for the SoCs that need to use the new
comboable PSP directory table pointer.
TEST=Binary identical on amd/majolica, pcengines/apu2, amd/gardenia
Change-Id: I0c3f21065939d1b13c2607aba16cbef74dd8d389
Signed-off-by: Zheng Bao <fishbaozi@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/73020
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Diffstat (limited to 'src')
| -rw-r--r-- | src/soc/amd/cezanne/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/soc/amd/glinda/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/soc/amd/mendocino/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/soc/amd/phoenix/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/soc/amd/picasso/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/Makefile.inc | 9 |
6 files changed, 0 insertions, 14 deletions
diff --git a/src/soc/amd/cezanne/Makefile.inc b/src/soc/amd/cezanne/Makefile.inc index 808c1e8136..f19dce00f1 100644 --- a/src/soc/amd/cezanne/Makefile.inc +++ b/src/soc/amd/cezanne/Makefile.inc @@ -200,7 +200,6 @@ AMDFW_COMMON_ARGS=$(OPT_PSP_APCB_FILES) \ $(OPT_PSP_LOAD_MP2_FW) \ --use-pspsecureos \ --load-s0i3 \ - --combo-capable \ $(OPT_TOKEN_UNLOCK) \ $(OPT_WHITELIST_FILE) \ $(OPT_SPL_TABLE_FILE) \ diff --git a/src/soc/amd/glinda/Makefile.inc b/src/soc/amd/glinda/Makefile.inc index 2fc7a9ce6a..ade2ee887a 100644 --- a/src/soc/amd/glinda/Makefile.inc +++ b/src/soc/amd/glinda/Makefile.inc @@ -218,7 +218,6 @@ AMDFW_COMMON_ARGS=$(OPT_PSP_APCB_FILES) \ $(OPT_PSP_LOAD_MP2_FW) \ --use-pspsecureos \ --load-s0i3 \ - --combo-capable \ $(OPT_TOKEN_UNLOCK) \ $(OPT_WHITELIST_FILE) \ $(OPT_PSP_SHAREDMEM_BASE) \ diff --git a/src/soc/amd/mendocino/Makefile.inc b/src/soc/amd/mendocino/Makefile.inc index 0679a542ae..226dc846e2 100644 --- a/src/soc/amd/mendocino/Makefile.inc +++ b/src/soc/amd/mendocino/Makefile.inc @@ -221,7 +221,6 @@ AMDFW_COMMON_ARGS=$(OPT_PSP_APCB_FILES) \ $(OPT_PSP_LOAD_MP2_FW) \ --use-pspsecureos \ --load-s0i3 \ - --combo-capable \ $(OPT_TOKEN_UNLOCK) \ $(OPT_WHITELIST_FILE) \ $(OPT_PSP_SHAREDMEM_BASE) \ diff --git a/src/soc/amd/phoenix/Makefile.inc b/src/soc/amd/phoenix/Makefile.inc index a1e8765909..2300671bcf 100644 --- a/src/soc/amd/phoenix/Makefile.inc +++ b/src/soc/amd/phoenix/Makefile.inc @@ -220,7 +220,6 @@ AMDFW_COMMON_ARGS=$(OPT_PSP_APCB_FILES) \ $(OPT_PSP_LOAD_MP2_FW) \ --use-pspsecureos \ --load-s0i3 \ - --combo-capable \ $(OPT_TOKEN_UNLOCK) \ $(OPT_WHITELIST_FILE) \ $(OPT_PSP_SHAREDMEM_BASE) \ diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc index e00784d5a5..fdbed85b7c 100644 --- a/src/soc/amd/picasso/Makefile.inc +++ b/src/soc/amd/picasso/Makefile.inc @@ -221,7 +221,6 @@ AMDFW_COMMON_ARGS=$(OPT_PSP_APCB_FILES) \ $(OPT_WHITELIST_FILE) \ $(OPT_PSP_SHAREDMEM_BASE) \ $(OPT_PSP_SHAREDMEM_SIZE) \ - --combo-capable \ $(OPT_TOKEN_UNLOCK) \ $(OPT_EFS_SPI_READ_MODE) \ $(OPT_EFS_SPI_SPEED) \ diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc index 4d427a3a77..547303b4d2 100644 --- a/src/soc/amd/stoneyridge/Makefile.inc +++ b/src/soc/amd/stoneyridge/Makefile.inc @@ -122,14 +122,6 @@ SMUFWM_FN_FILE= SMUFIRMWARE2_FN_FILE= endif -ifeq ($(FIRMWARE_TYPE),ST) -OPT_COMBOCAPABLE=--combo-capable -endif - -ifeq ($(FIRMWARE_TYPE),CZ) -OPT_COMBOCAPABLE=--combo-capable -endif - ifeq ($(CONFIG_USE_PSPSECUREOS),y) PSP_USE_PSPSECUREOS="--use-pspsecureos" endif @@ -148,7 +140,6 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(CONFIG_STONEYRIDGE_XHCI_FWM_FILE)) \ $(AMDFWTOOL) \ $(OPT_STONEYRIDGE_XHCI_FWM_FILE) \ $(OPT_STONEYRIDGE_GEC_FWM_FILE) \ - $(OPT_COMBOCAPABLE)\ $(OPT_PSP_USE_PSPSECUREOS) \ $(OPT_EFS_SPI_READ_MODE) \ $(OPT_EFS_SPI_SPEED) \ |