Change in coreboot[master]: soc/amd/picasso: Drop addition of PUBSIGNEDKEY_FILE

[Furquan Shaikh (Code Review)]

Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40682 )

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

soc/amd/picasso: Drop addition of PUBSIGNEDKEY_FILE

This change drops the addition of PUBSIGNEDKEY_FILE to PSP
directory. This file is used to add OEM key for BIOS, however this is
currently unused for upcoming zork board. In the future, if any
mainboard needs this, it can be added based on some Kconfig selection.

BUG=b:154880818
TEST=Verified that trembyle still boots up fine.

Signed-off-by: Furquan Shaikh 
Change-Id: Icd97856a94a100898678702d99bbe29b82956004
---
M src/soc/amd/picasso/Makefile.inc
1 file changed, 0 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/40682/1

diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index d31e518..e686ab8 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -100,9 +100,6 @@
 PSPBTLDR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspBootLoader_prod_RV.sbin
 endif

-# type = 0x5
-PUBSIGNEDKEY_FILE=$(top)/$(FIRMWARE_LOCATE)/RtmPubSignedRV.key
-
 # types = 0x8 and 0x18
 PSP_SMUFW1_SUB1_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmwareRV2.csbin
 PSP_SMUFW1_SUB2_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmwarePCO.csbin
@@ -213,7 +210,6 @@
 OPT_AMD_PUBKEY_FILE=$(call add_opt_prefix, $(CONFIG_AMD_PUBKEY_FILE), --pubkey)
 OPT_PSPBTLDR_FILE=$(call add_opt_prefix, $(PSPBTLDR_FILE), --bootloader)
 OPT_PSPNVRAM_FILE=$(call add_opt_prefix, $(PSPNVRAM_FILE), --nvram)
-OPT_PUBSIGNEDKEY_FILE=$(call add_opt_prefix, $(PUBSIGNEDKEY_FILE), --rtmpubkey)
 OPT_SMUFW1_SUB1_FILE=$(call add_opt_prefix, $(PSP_SMUFW1_SUB1_FILE), --subprogram 1 --smufirmware)
 OPT_SMUFW1_SUB2_FILE=$(call add_opt_prefix, $(PSP_SMUFW1_SUB2_FILE), --subprogram 2 --smufirmware)
 OPT_SMUFW2_SUB1_FILE=$(call add_opt_prefix, $(PSP_SMUFW2_SUB1_FILE), --subprogram 1 --smufirmware2)
@@ -265,7 +261,6 @@
 OPT_MP2CFG_FILE=$(call add_opt_prefix, $(PSP_MP2CFG_FILE), --mp2-config)

$(obj)/amdfw.rom:	$(call strip_quotes, $(CONFIG_AMD_PUBKEY_FILE)) \
-			$(call strip_quotes, $(PUBSIGNEDKEY_FILE)) \
    		$(call strip_quotes, $(PSPBTLDR_FILE)) \
    		$(call strip_quotes, $(PSPSCUREOS_FILE)) \
    		$(call strip_quotes, $(PSP_SEC_DBG_KEY_FILE)) \
@@ -313,7 +308,6 @@
    $(AMDFWTOOL) \
    	$(OPT_AMD_PUBKEY_FILE) \
    	$(OPT_PSPBTLDR_FILE) \
-		$(OPT_PUBSIGNEDKEY_FILE) \
    	$(OPT_PSPSCUREOS_FILE) \
    	$(OPT_PSP_SEC_DBG_KEY_FILE) \
    	$(OPT_PSPTRUSTLETS_FILE) \

[Furquan Shaikh (Code Review)]

Hello Patrick Georgi, Martin Roth,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/40682

to look at the new patch set (#2).

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

soc/amd/picasso: Drop addition of PUBSIGNEDKEY_FILE

This change drops the addition of PUBSIGNEDKEY_FILE to PSP
directory. This file is used to add OEM key for BIOS, however this is
currently unused for upcoming zork board. In the future, if any
mainboard needs this, it can be added based on some Kconfig selection.

BUG=b:154880818
TEST=Verified that trembyle still boots up fine.

Signed-off-by: Furquan Shaikh 
Change-Id: Icd97856a94a100898678702d99bbe29b82956004
---
M src/soc/amd/picasso/Makefile.inc
1 file changed, 0 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/40682/2

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40682 )

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

Patch Set 2: Code-Review+1

[Aaron Durbin (Code Review)]

Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40682 )

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

Patch Set 2: Code-Review+2

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40682 )

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

Patch Set 3: Code-Review+2

[Marshall Dawson (Code Review)]

Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40682 )

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

Patch Set 3: Code-Review+2

[Furquan Shaikh (Code Review)]

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

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

soc/amd/picasso: Drop addition of PUBSIGNEDKEY_FILE

This change drops the addition of PUBSIGNEDKEY_FILE to PSP
directory. This file is used to add OEM key for BIOS, however this is
currently unused for upcoming zork board. In the future, if any
mainboard needs this, it can be added based on some Kconfig selection.

BUG=b:154880818
TEST=Verified that trembyle still boots up fine.

Signed-off-by: Furquan Shaikh 
Change-Id: Icd97856a94a100898678702d99bbe29b82956004
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40682
Reviewed-by: Angel Pons 
Reviewed-by: Marshall Dawson 
Reviewed-by: Aaron Durbin 
Tested-by: build bot (Jenkins) 
---
M src/soc/amd/picasso/Makefile.inc
1 file changed, 0 insertions(+), 6 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Aaron Durbin: Looks good to me, approved
  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 b04e1e9..4991315 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -103,9 +103,6 @@
 PSPBTLDR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspBootLoader_prod_RV.sbin
 endif

-# type = 0x5
-PUBSIGNEDKEY_FILE=$(top)/$(FIRMWARE_LOCATE)/RtmPubSignedRV.key
-
 # types = 0x8 and 0x18
 PSP_SMUFW1_SUB1_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmwareRV2.csbin
 PSP_SMUFW1_SUB2_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmwarePCO.csbin
@@ -220,7 +217,6 @@
 OPT_AMD_PUBKEY_FILE=$(call add_opt_prefix, $(CONFIG_AMD_PUBKEY_FILE), --pubkey)
 OPT_PSPBTLDR_FILE=$(call add_opt_prefix, $(PSPBTLDR_FILE), --bootloader)
 OPT_PSPNVRAM_FILE=$(call add_opt_prefix, $(PSPNVRAM_FILE), --nvram)
-OPT_PUBSIGNEDKEY_FILE=$(call add_opt_prefix, $(PUBSIGNEDKEY_FILE), --rtmpubkey)
 OPT_SMUFW1_SUB1_FILE=$(call add_opt_prefix, $(PSP_SMUFW1_SUB1_FILE), --subprogram 1 --smufirmware)
 OPT_SMUFW1_SUB2_FILE=$(call add_opt_prefix, $(PSP_SMUFW1_SUB2_FILE), --subprogram 2 --smufirmware)
 OPT_SMUFW2_SUB1_FILE=$(call add_opt_prefix, $(PSP_SMUFW2_SUB1_FILE), --subprogram 1 --smufirmware2)
@@ -272,7 +268,6 @@
 OPT_MP2CFG_FILE=$(call add_opt_prefix, $(PSP_MP2CFG_FILE), --mp2-config)

$(obj)/amdfw.rom:	$(call strip_quotes, $(CONFIG_AMD_PUBKEY_FILE)) \
-			$(call strip_quotes, $(PUBSIGNEDKEY_FILE)) \
    		$(call strip_quotes, $(PSPBTLDR_FILE)) \
    		$(call strip_quotes, $(PSPSCUREOS_FILE)) \
    		$(call strip_quotes, $(PSP_SEC_DBG_KEY_FILE)) \
@@ -320,7 +315,6 @@
    $(AMDFWTOOL) \
    	$(OPT_AMD_PUBKEY_FILE) \
    	$(OPT_PSPBTLDR_FILE) \
-		$(OPT_PUBSIGNEDKEY_FILE) \
    	$(OPT_PSPSCUREOS_FILE) \
    	$(OPT_PSP_SEC_DBG_KEY_FILE) \
    	$(OPT_PSPTRUSTLETS_FILE) \