[coreboot-gerrit] Change in coreboot[master]: soc/amd/picasso: always include PSP secure OS in amdfw

[Felix Held (Code Review)]

Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/50603 )

Change subject: soc/amd/picasso: always include PSP secure OS in amdfw
......................................................................

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 
Change-Id: I60d0e5ab0bd9f4d76cc48d08ca05d27c60e898c4
---
M src/soc/amd/picasso/Kconfig
M src/soc/amd/picasso/Makefile.inc
2 files changed, 1 insertion(+), 15 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/50603/1

diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index 410048f..495a47f 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -387,14 +387,6 @@
    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 99e2da1..b2c112e 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -101,12 +101,6 @@
 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
@@ -213,7 +207,7 @@
    	$(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) \