diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2021-02-12 20:51:55 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2021-02-13 20:53:12 +0000 |
| commit | 5f5b7ddbf3f80cbd4135aaa0d668387acf40d7a5 (patch) | |
| tree | 02f9045f44e369f9bcfa18b1da7b563e72259035 | |
| parent | bb3e9ef5072d1e36a71db71a3d40967408864868 (diff) | |
| download | coreboot-5f5b7ddbf3f80cbd4135aaa0d668387acf40d7a5.tar.xz | |
soc/amd/cezanne: always include PSP secure OS in amdfw
When USE_PSPSECUREOS isn't selected, we don't even get post codes on
Majolica, so remove this option.
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I0ec976f40d962a2d9f2bd36dc97d86526bd661ae
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50601
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
| -rw-r--r-- | src/soc/amd/cezanne/Kconfig | 8 | ||||
| -rw-r--r-- | src/soc/amd/cezanne/Makefile.inc | 8 |
2 files changed, 1 insertions, 15 deletions
diff --git a/src/soc/amd/cezanne/Kconfig b/src/soc/amd/cezanne/Kconfig index f4386fb2f5..64c3d54f95 100644 --- a/src/soc/amd/cezanne/Kconfig +++ b/src/soc/amd/cezanne/Kconfig @@ -211,14 +211,6 @@ config AMDFW_CONFIG_FILE string default "src/soc/amd/cezanne/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/cezanne/Makefile.inc b/src/soc/amd/cezanne/Makefile.inc index 0e69103c1f..2bb9fb10bf 100644 --- a/src/soc/amd/cezanne/Makefile.inc +++ b/src/soc/amd/cezanne/Makefile.inc @@ -74,12 +74,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 @@ -146,8 +140,8 @@ AMDFW_COMMON_ARGS=$(OPT_PSP_APCB_FILES) \ $(OPT_PSP_BIOSBIN_DEST) \ $(OPT_PSP_BIOSBIN_SIZE) \ $(OPT_PSP_SOFTFUSE) \ - $(OPT_PSP_USE_PSPSECUREOS) \ $(OPT_PSP_LOAD_MP2_FW) \ + --use-pspsecureos \ --load-s0i3 \ --combo-capable \ $(OPT_TOKEN_UNLOCK) \ |