diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2021-02-12 18:26:08 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2021-02-13 20:52:49 +0000 |
| commit | bb3e9ef5072d1e36a71db71a3d40967408864868 (patch) | |
| tree | ef5da460e23f6bfb2efbf0395529d2b9fe799c36 /src/soc/amd | |
| parent | 2e1384aa4790c90737bb082510862661b819ff84 (diff) | |
soc/amd/cezanne: always add S0i3 firmware part to amdfw
Without this part being present in amdfw the PSP won't enter its normal
operation mode, but goes into recovery mode instead.
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: If13b5495e9f246afd0317daaa53c3d2cefbaa4dc
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50600
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-by: Matt Papageorge <matthewpapa07@gmail.com>
Diffstat (limited to 'src/soc/amd')
| -rw-r--r-- | src/soc/amd/cezanne/Kconfig | 6 | ||||
| -rw-r--r-- | src/soc/amd/cezanne/Makefile.inc | 6 |
2 files changed, 1 insertions, 11 deletions
diff --git a/src/soc/amd/cezanne/Kconfig b/src/soc/amd/cezanne/Kconfig index 50754a9e52..f4386fb2f5 100644 --- a/src/soc/amd/cezanne/Kconfig +++ b/src/soc/amd/cezanne/Kconfig @@ -227,12 +227,6 @@ config PSP_LOAD_MP2_FW If unsure, answer 'n' -config PSP_LOAD_S0I3_FW - bool - default n - help - Select this item to include the S0i3 file into the PSP build. - config PSP_UNLOCK_SECURE_DEBUG bool "Unlock secure debug" default y diff --git a/src/soc/amd/cezanne/Makefile.inc b/src/soc/amd/cezanne/Makefile.inc index e6bccc332a..0e69103c1f 100644 --- a/src/soc/amd/cezanne/Makefile.inc +++ b/src/soc/amd/cezanne/Makefile.inc @@ -87,10 +87,6 @@ else PSP_SOFTFUSE_BITS += 29 endif -ifeq ($(CONFIG_PSP_LOAD_S0I3_FW),y) -OPT_PSP_LOAD_S0I3_FW="--load-s0i3" -endif - # # BIOS Directory Table items - proper ordering is managed by amdfwtool # @@ -152,7 +148,7 @@ AMDFW_COMMON_ARGS=$(OPT_PSP_APCB_FILES) \ $(OPT_PSP_SOFTFUSE) \ $(OPT_PSP_USE_PSPSECUREOS) \ $(OPT_PSP_LOAD_MP2_FW) \ - $(OPT_PSP_LOAD_S0I3_FW) \ + --load-s0i3 \ --combo-capable \ $(OPT_TOKEN_UNLOCK) \ $(OPT_EFS_SPI_READ_MODE) \ |