From 923215184d3720d836c2be75a95c629af6dac7c9 Mon Sep 17 00:00:00 2001 From: Grzegorz Bernacki Date: Wed, 5 Apr 2023 10:41:02 +0000 Subject: soc/amd/mendocino: Add manifest generation to Makefile This adds manifest generated by amdfwtool to CBFS. BUG=b:224780134 TEST=Tested on Skyrim device Change-Id: I13c9d322735e0979484b120c665fb100cf187eab Signed-off-by: Grzegorz Bernacki Reviewed-on: https://review.coreboot.org/c/coreboot/+/74267 Reviewed-by: Raul Rangel Tested-by: build bot (Jenkins) Reviewed-by: Karthik Ramasubramanian --- src/soc/amd/mendocino/Makefile.inc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/soc/amd/mendocino/Makefile.inc b/src/soc/amd/mendocino/Makefile.inc index 9d9adce08d..8e33cf5167 100644 --- a/src/soc/amd/mendocino/Makefile.inc +++ b/src/soc/amd/mendocino/Makefile.inc @@ -216,6 +216,9 @@ OPT_SPL_RW_AB_TABLE_FILE=$(call add_opt_prefix, $(SPL_RW_AB_TABLE_FILE), --spl-t # 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) +MANIFEST_FILE=$(obj)/amdfw_manifest +OPT_MANIFEST=$(call add_opt_prefix, $(MANIFEST_FILE), --output-manifest) + AMDFW_COMMON_ARGS=$(OPT_PSP_APCB_FILES) \ $(OPT_APOB_ADDR) \ $(OPT_DEBUG_AMDFWTOOL) \ @@ -259,6 +262,7 @@ $(obj)/amdfw.rom: $(call strip_quotes, $(PSP_BIOSBIN_FILE)) \ $(OPT_VERSTAGE_FILE) \ $(OPT_VERSTAGE_SIG_FILE) \ $(OPT_SPL_TABLE_FILE) \ + $(OPT_MANIFEST) \ --location $(shell printf "%#x" $(MENDOCINO_FWM_POSITION)) \ --output $@ @@ -309,6 +313,11 @@ $(obj)/amdfw_b.rom: $(obj)/amdfw.rom $(obj)/amdfw_a.rom.body: $(obj)/amdfw_a.rom $(obj)/amdfw_b.rom.body: $(obj)/amdfw_b.rom +$(MANIFEST_FILE): $(obj)/amdfw.rom +cbfs-files-y += amdfw_manifest +amdfw_manifest-file := $(MANIFEST_FILE) +amdfw_manifest-type := raw + ifeq ($(CONFIG_VBOOT_SLOTS_RW_A)$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),yy) cbfs-files-y += apu/amdfw_a apu/amdfw_a-file := $(obj)/amdfw_a.rom -- cgit v1.2.3