Change in coreboot[master]: Revert commit bfb5c807e720761f4457d5106bb919f2aacb5535 binaryPI: Drop...

[Name of user not set (Code Review)]

Name of user not set #1002701 has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37533 )

Change subject: Revert commit bfb5c807e720761f4457d5106bb919f2aacb5535 binaryPI: Drop PSP Secure OS from build
......................................................................

Revert commit bfb5c807e720761f4457d5106bb919f2aacb5535 binaryPI: Drop PSP Secure OS from build

For AMD Bettong board to boot these changes should be reverted.

Change-Id: I903824019ebbe7934dbe12297b3a223cab3461c5
Signed-off-by: Jorge Fernandez 
---
M src/southbridge/amd/pi/hudson/Makefile.inc
1 file changed, 7 insertions(+), 7 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/33/37533/1

diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc
index 0eccadb..33f59c7 100644
--- a/src/southbridge/amd/pi/hudson/Makefile.inc
+++ b/src/southbridge/amd/pi/hudson/Makefile.inc
@@ -85,10 +85,10 @@
 FIRMWARE_TYPE=

PSPBTLDR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspBootLoader.Bypass.sbin
-#PSPRCVR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspRecovery.sbin
-#PSPSCUREOS_FILE=$(top)/$(FIRMWARE_LOCATE)/PspSecureOs.sbin
-#PSPTRUSTLETS_FILE=$(top)/$(FIRMWARE_LOCATE)/trustlets.bin
-#TRUSTLETKEY_FILE=$(top)/$(FIRMWARE_LOCATE)/Trustlet.tkn.cert
+PSPRCVR_FILE=$(top)/$(FIRMWARE_LOCATE)/PspRecovery.sbin
+PSPSCUREOS_FILE=$(top)/$(FIRMWARE_LOCATE)/PspSecureOs.sbin
+PSPTRUSTLETS_FILE=$(top)/$(FIRMWARE_LOCATE)/trustlets.bin
+TRUSTLETKEY_FILE=$(top)/$(FIRMWARE_LOCATE)/Trustlet.tkn.cert
 endif

ifeq ($(CONFIG_CPU_AMD_PI_00660F01), y)
@@ -103,12 +103,12 @@
 SMUFIRMWARE2_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware2_prod_CZ.sbin
 endif

-#PUBSIGNEDKEY_FILE=$(top)/$(FIRMWARE_LOCATE)/RtmPubSigned$(FIRMWARE_TYPE).key
-#PSPNVRAM_FILE=$(top)/$(FIRMWARE_LOCATE)/PspNvram$(FIRMWARE_TYPE).bin
+PUBSIGNEDKEY_FILE=$(top)/$(FIRMWARE_LOCATE)/RtmPubSigned$(FIRMWARE_TYPE).key
+PSPNVRAM_FILE=$(top)/$(FIRMWARE_LOCATE)/PspNvram$(FIRMWARE_TYPE).bin
 SMUFWM_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware$(FIRMWARE_TYPE).sbin
 SMUFWM_FN_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuFirmware$(FIRMWARE_TYPE)_FN.sbin
 SMUSCS_FILE=$(top)/$(FIRMWARE_LOCATE)/SmuScs$(FIRMWARE_TYPE).bin
-#PSPSECUREDEBUG_FILE=$(top)/$(FIRMWARE_LOCATE)/PspSecureDebug$(FIRMWARE_TYPE).Key
+PSPSECUREDEBUG_FILE=$(top)/$(FIRMWARE_LOCATE)/PspSecureDebug$(FIRMWARE_TYPE).Key

endif

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37533 )

Change subject: Revert commit bfb5c807e720761f4457d5106bb919f2aacb5535 binaryPI: Drop PSP Secure OS from build
......................................................................

Patch Set 1:

(2 comments)

https://review.coreboot.org/c/coreboot/+/37533/1/src/southbridge/amd/pi/huds... 
File src/southbridge/amd/pi/hudson/Makefile.inc:

https://review.coreboot.org/c/coreboot/+/37533/1/src/southbridge/amd/pi/huds... 
PS1, Line 92: endif
The section above is only for CPU_AMD_PI_00730F01 and having them commented out would not affect amd/bettong in any way.

https://review.coreboot.org/c/coreboot/+/37533/1/src/southbridge/amd/pi/huds... 
PS1, Line 111: PSPSECUREDEBUG_FILE=$(top)/$(FIRMWARE_LOCATE)/PspSecureDebug$(FIRMWARE_TYPE).Key
Please try individually which ones of these you need to change to make it boot.

[Marshall Dawson (Code Review)]

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

Change subject: Revert commit bfb5c807e720761f4457d5106bb919f2aacb5535 binaryPI: Drop PSP Secure OS from build
......................................................................

Patch Set 1:

I agree with finding exactly which files are needed.  I really doubt it will be the SecureOs, PspTrustlets, or TrustletKey files.  See soc/amd/stoneyridge/Makefile.inc and Kconfig for how the Secure OS was removed.

I think a better approach is to make it a config option like in stoneyridge.  And maybe default it to n if you find those files aren't necessary on Bettong.  (I infer you have a Merlin Falcon on yours and not a Prairie Falcon, BTW.)

[Name of user not set (Code Review)]

Name of user not set #1002701 has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37533 )

Change subject: Revert commit bfb5c807e720761f4457d5106bb919f2aacb5535 binaryPI: Drop PSP Secure OS from build
......................................................................

Patch Set 1:
> Patch Set 1:
>
> I agree with finding exactly which files are needed.  I really doubt it will be the SecureOs, PspTrustlets, or TrustletKey files.  See soc/amd/stoneyridge/Makefile.inc and Kconfig for how the Secure OS was removed.
>
> I think a better approach is to make it a config option like in stoneyridge.  And maybe default it to n if you find those files aren't necessary on Bettong.  (I infer you have a Merlin Falcon on yours and not a Prairie Falcon, BTW.)

I've tried and I need the three files to boot the board. I've tried to replicate the Makefile.inc in stoneyridge using CONFIG_USE_PSPSECUREOS, but with this option set to false the board doesn't boots.

[Name of user not set (Code Review)]

Name of user not set #1002701 has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37533 )

Change subject: Revert commit bfb5c807e720761f4457d5106bb919f2aacb5535 binaryPI: Drop PSP Secure OS from build
......................................................................

Patch Set 1:
> I think a better approach is to make it a config option like in stoneyridge.  And maybe default it to n if you find those files aren't necessary on Bettong.  (I infer you have a Merlin Falcon on yours and not a Prairie Falcon, BTW.)

Yes, you're right

[S] Change in coreboot[master]: Revert commit bfb5c807e720761f4457d5106bb919f2aacb5535 binaryPI: Drop...

[Martin L Roth (Code Review)]

Martin L Roth has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/37533?usp=email )

Change subject: Revert commit bfb5c807e720761f4457d5106bb919f2aacb5535 binaryPI: Drop PSP Secure OS from build
......................................................................

Abandoned

This patch has not been touched in over 12 months. Anyone who wants to take over work on this patch, please feel free to restore it and do any work needed to get it merged. If you create a new patch based on this work, please credit the original author.