Change in coreboot[master]: soc/amd/sabrina: Maintain a single copy of PSP Level2 entries

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/63510 )

Change subject: soc/amd/sabrina: Maintain a single copy of PSP Level2 entries
......................................................................

soc/amd/sabrina: Maintain a single copy of PSP Level2 entries

If verified boot uses 2 RW FW slots, configure amdfwtool to maintain
single copy of PSP Level2 entries.

BUG=None
TEST=Build and boot to OS in Skyrim.

Signed-off-by: Karthikeyan Ramasubramanian 
Change-Id: I94eea693139b714c321b4be89380342ec7a21222
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63510
Tested-by: build bot (Jenkins) 
Reviewed-by: Raul Rangel 
---
M src/soc/amd/sabrina/Makefile.inc
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Raul Rangel: Looks good to me, approved

diff --git a/src/soc/amd/sabrina/Makefile.inc b/src/soc/amd/sabrina/Makefile.inc
index b7b538e..fdad9b7 100644
--- a/src/soc/amd/sabrina/Makefile.inc
+++ b/src/soc/amd/sabrina/Makefile.inc
@@ -189,6 +189,9 @@

OPT_WHITELIST_FILE=$(call add_opt_prefix, $(PSP_WHITELIST_FILE), --whitelist)

+# If vboot uses 2 RW slots, then 2 copies of PSP binaries are redundant
+OPT_RECOVERY_AB_SINGLE_COPY=$(if $(CONFIG_VBOOT_SLOTS_RW_AB), --recovery-ab-single-copy)
+
 # Add all the files listed in the config file
 POUND_SIGN=$(call strip_quotes, "#")
 DEP_FILES= $(patsubst %,$(FIRMWARE_LOCATION)/%, $(shell sed -e /^$(POUND_SIGN)/d -e /*/d -e /^FIRMWARE_LOCATION/d $(CONFIG_AMDFW_CONFIG_FILE) | awk '{print $$2}' ))
@@ -212,7 +215,8 @@
    	$(OPT_EFS_SPI_MICRON_FLAG) \
    	--config $(CONFIG_AMDFW_CONFIG_FILE) \
    	--soc-name "Sabrina" \
-		--flashsize $(CONFIG_ROM_SIZE)
+		--flashsize $(CONFIG_ROM_SIZE) \
+		$(OPT_RECOVERY_AB_SINGLE_COPY)

$(obj)/amdfw.rom:	$(call strip_quotes, $(PSP_BIOSBIN_FILE)) \
    		$(PSP_VERSTAGE_FILE) \

2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.