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>
This commit is contained in:
parent
6ab87664b7
commit
b03dc9c12b
|
@ -373,14 +373,6 @@ config AMDFW_CONFIG_FILE
|
||||||
string
|
string
|
||||||
default "src/soc/amd/picasso/fw.cfg"
|
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
|
config PSP_LOAD_MP2_FW
|
||||||
bool
|
bool
|
||||||
default n
|
default n
|
||||||
|
|
|
@ -100,12 +100,6 @@ PSP_SOFTFUSE_BITS += 0
|
||||||
OPT_TOKEN_UNLOCK="--token-unlock"
|
OPT_TOKEN_UNLOCK="--token-unlock"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_USE_PSPSECUREOS),y)
|
|
||||||
# types = 0x2
|
|
||||||
OPT_PSP_USE_PSPSECUREOS="--use-pspsecureos"
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(CONFIG_PSP_LOAD_MP2_FW),y)
|
ifeq ($(CONFIG_PSP_LOAD_MP2_FW),y)
|
||||||
OPT_PSP_LOAD_MP2_FW="--load-mp2-fw"
|
OPT_PSP_LOAD_MP2_FW="--load-mp2-fw"
|
||||||
else
|
else
|
||||||
|
@ -212,7 +206,7 @@ AMDFW_COMMON_ARGS=$(OPT_PSP_APCB_FILES) \
|
||||||
$(OPT_PSP_BIOSBIN_DEST) \
|
$(OPT_PSP_BIOSBIN_DEST) \
|
||||||
$(OPT_PSP_BIOSBIN_SIZE) \
|
$(OPT_PSP_BIOSBIN_SIZE) \
|
||||||
$(OPT_PSP_SOFTFUSE) \
|
$(OPT_PSP_SOFTFUSE) \
|
||||||
$(OPT_PSP_USE_PSPSECUREOS) \
|
--use-pspsecureos \
|
||||||
$(OPT_PSP_LOAD_MP2_FW) \
|
$(OPT_PSP_LOAD_MP2_FW) \
|
||||||
$(OPT_PSP_LOAD_S0I3_FW) \
|
$(OPT_PSP_LOAD_S0I3_FW) \
|
||||||
$(OPT_WHITELIST_FILE) \
|
$(OPT_WHITELIST_FILE) \
|
||||||
|
|
Loading…
Reference in New Issue