[coreboot-gerrit] Change in coreboot[master]: soc/amd/picasso: Drop addition of PSPTRUSTLETS_FILE

[Furquan Shaikh (Code Review)]

Furquan Shaikh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/40685 )

Change subject: soc/amd/picasso: Drop addition of PSPTRUSTLETS_FILE
......................................................................

soc/amd/picasso: Drop addition of PSPTRUSTLETS_FILE

PSPTRUSTLETS_FILE was including a binary for fTPM which according to
BIOS architecture design guide is the firmware enabled TPM. Chrome OS
does not really use firmware enabled TPM. Also, this is an option
which is mainboard dependent.

This change drops the addition of PSPTRUSTLETS_FILE to PSP
directory. If this is something that is required by any mainboard,
there should be a separate Kconfig to include the required files.

BUG=b:154880818
TEST=Verified that trembyle still boots

Signed-off-by: Furquan Shaikh 
Change-Id: Iaa2126c879986d00c921c85fb5cb5257c7065006
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40685
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
Reviewed-by: Marshall Dawson 
---
M src/soc/amd/picasso/Makefile.inc
1 file changed, 1 insertion(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Marshall Dawson: Looks good to me, approved
  Angel Pons: Looks good to me, approved

diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index b428b5d..6fd1524 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -116,9 +116,8 @@
 PSP_SOFTFUSE="0x0000000010000001"

ifeq ($(CONFIG_USE_PSPSCUREOS),y)
-# types = 0x2, 0xc
+# types = 0x2
 PSPSCUREOS_FILE=$(top)/$(FIRMWARE_LOCATE)/psp_os_combined_prod_RV.sbin
-PSPTRUSTLETS_FILE=$(top)/$(FIRMWARE_LOCATE)/dr_ftpm_prod_RV.csbin
 endif

# type = 0x13
@@ -223,7 +222,6 @@
 OPT_PSP_SEC_DBG_KEY_FILE=$(call add_opt_prefix, $(PSP_SEC_DBG_KEY_FILE), --securedebug)
 OPT_PSP_SOFTFUSE=$(call add_opt_prefix, $(PSP_SOFTFUSE), --soft-fuse)
 OPT_PSPSCUREOS_FILE=$(call add_opt_prefix, $(PSPSCUREOS_FILE), --secureos)
-OPT_PSPTRUSTLETS_FILE=$(call add_opt_prefix, $(PSPTRUSTLETS_FILE), --trustlets)
 OPT_SEC_DEBUG_FILE=$(call add_opt_prefix, $(PSP_SEC_DEBUG_FILE), --secdebug)
 OPT_IKEK_FILE=$(call add_opt_prefix, $(PSP_IKEK_FILE), --ikek)
 OPT_SECG1_FILE=$(call add_opt_prefix, $(PSP_SECG1_FILE), --subprog 1 --sec-gasket)
@@ -270,7 +268,6 @@
    		$(call strip_quotes, $(PSPBTLDR_FILE)) \
    		$(call strip_quotes, $(PSPSCUREOS_FILE)) \
    		$(call strip_quotes, $(PSP_SEC_DBG_KEY_FILE)) \
-			$(call strip_quotes, $(PSPTRUSTLETS_FILE)) \
    		$(call strip_quotes, $(PSP_APCB0_FILE)) \
    		$(call strip_quotes, $(PSP_APCB1_FILE)) \
    		$(call strip_quotes, $(PSP_APCB2_FILE)) \
@@ -316,7 +313,6 @@
    	$(OPT_PSPBTLDR_FILE) \
    	$(OPT_PSPSCUREOS_FILE) \
    	$(OPT_PSP_SEC_DBG_KEY_FILE) \
-		$(OPT_PSPTRUSTLETS_FILE) \
    	$(OPT_SMUFW1_SUB2_FILE) \
    	$(OPT_SMUFW2_SUB2_FILE) \
    	$(OPT_SMUFW1_SUB1_FILE) \