diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2021-02-12 21:59:47 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2021-02-14 21:58:10 +0000 |
| commit | b03dc9c12b39b141c6a7c9aa91712bf2678af201 (patch) | |
| tree | 69c716a787a6d81d32f244e4c2545d4954ad90e1 | |
| parent | 6ab87664b7566bed1763a93e67e74d06315797e9 (diff) | |
soc/amd/picasso: always include PSP secure OS in amdfw
When USE_PSPSECUREOS isn't selected, we get stuck in FSP-S.
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I60d0e5ab0bd9f4d76cc48d08ca05d27c60e898c4
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50603
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
| -rw-r--r-- | src/soc/amd/picasso/Kconfig | 8 | ||||
| -rw-r--r-- | src/soc/amd/picasso/Makefile.inc | 8 |
2 files changed, 1 insertions, 15 deletions
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig index 495d28fd91..2057ad420e 100644 --- a/src/soc/amd/picasso/Kconfig +++ b/src/soc/amd/picasso/Kconfig @@ -373,14 +373,6 @@ config AMDFW_CONFIG_FILE string default "src/soc/amd/picasso/fw.cfg" -config USE_PSPSECUREOS - bool - default y - help - Include the PspSecureOs and PspTrustlet binaries in the PSP build. - - If unsure, answer 'y' - config PSP_LOAD_MP2_FW bool default n diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc index d2a5e4c393..8a965c4f0d 100644 --- a/src/soc/amd/picasso/Makefile.inc +++ b/src/soc/amd/picasso/Makefile.inc @@ -100,12 +100,6 @@ PSP_SOFTFUSE_BITS += 0 OPT_TOKEN_UNLOCK="--token-unlock" endif -ifeq ($(CONFIG_USE_PSPSECUREOS),y) -# types = 0x2 -OPT_PSP_USE_PSPSECUREOS="--use-pspsecureos" -endif - - ifeq ($(CONFIG_PSP_LOAD_MP2_FW),y) OPT_PSP_LOAD_MP2_FW="--load-mp2-fw" else @@ -212,7 +206,7 @@ AMDFW_COMMON_ARGS=$(OPT_PSP_APCB_FILES) \ $(OPT_PSP_BIOSBIN_DEST) \ $(OPT_PSP_BIOSBIN_SIZE) \ $(OPT_PSP_SOFTFUSE) \ - $(OPT_PSP_USE_PSPSECUREOS) \ + --use-pspsecureos \ $(OPT_PSP_LOAD_MP2_FW) \ $(OPT_PSP_LOAD_S0I3_FW) \ $(OPT_WHITELIST_FILE) \ |