coreboot-mirror
/
coreboot
mirror of https://review.coreboot.org/coreboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Felix Held 2021-02-12 20:51:55 +01:00
parent bb3e9ef507
commit 5f5b7ddbf3
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/soc/amd/cezanne/Kconfig
View File

@ -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

8
src/soc/amd/cezanne/Makefile.inc
View File

@ -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) \