From 647abfd1d43dd7bb7a052595bd413192f711e29d Mon Sep 17 00:00:00 2001 From: Karthikeyan Ramasubramanian Date: Fri, 14 Jul 2023 16:30:07 -0600 Subject: soc/amd/phoenix: Makefile change to include split hash table Include multiple hash tables into relevant CBFS. BUG=b:277292697 TEST=Ensure that all multiple hash tables are part of Myst BIOS image with PSP verstage enabled. Change-Id: I1601f4a01db5b2bbf8b5636ef9e69e41c1d9a980 Signed-off-by: Karthikeyan Ramasubramanian Reviewed-on: https://review.coreboot.org/c/coreboot/+/76589 Reviewed-by: Martin Roth Tested-by: build bot (Jenkins) --- src/soc/amd/phoenix/Makefile.inc | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/soc') diff --git a/src/soc/amd/phoenix/Makefile.inc b/src/soc/amd/phoenix/Makefile.inc index bbc24d5e0a..852934ffb3 100644 --- a/src/soc/amd/phoenix/Makefile.inc +++ b/src/soc/amd/phoenix/Makefile.inc @@ -338,6 +338,18 @@ build_complete:: $(obj)/amdfw_a.rom $(obj)/amdfw_b.rom -n apu/amdfw_a_hash -t raw $(CBFSTOOL) $(obj)/coreboot.rom add -r FW_MAIN_B -f $(obj)/amdfw_b.rom.signed.hash \ -n apu/amdfw_b_hash -t raw + if [ -n "$(wildcard $(obj)/amdfw_a.rom.signed.1.hash)" ]; then \ + $(CBFSTOOL) $(obj)/coreboot.rom add -r FW_MAIN_A -f \ + $(obj)/amdfw_a.rom.signed.1.hash -n apu/amdfw_a_hash1 -t raw; \ + $(CBFSTOOL) $(obj)/coreboot.rom add -r FW_MAIN_B -f \ + $(obj)/amdfw_b.rom.signed.1.hash -n apu/amdfw_b_hash1 -t raw; \ + fi + if [ -n "$(wildcard $(obj)/amdfw_a.rom.signed.2.hash)" ]; then \ + $(CBFSTOOL) $(obj)/coreboot.rom add -r FW_MAIN_A -f \ + $(obj)/amdfw_a.rom.signed.2.hash -n apu/amdfw_a_hash2 -t raw; \ + $(CBFSTOOL) $(obj)/coreboot.rom add -r FW_MAIN_B -f \ + $(obj)/amdfw_b.rom.signed.2.hash -n apu/amdfw_b_hash2 -t raw; \ + fi endif # CONFIG_SEPARATE_SIGNED_PSPFW endif -- cgit v1.2.3