From 926d55cddd3353993604e08a7eb5d7671fd87d2f Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Thu, 13 Jul 2023 12:50:45 +0200 Subject: soc/amd/common: Use CBFSTOOL_ADD_CMD_OPTIONS when adding psp image Signed-off-by: Arthur Heymans Change-Id: I639fb1e911a7449d0db0d2bfcfbb6f4f225b0cef Reviewed-on: https://review.coreboot.org/c/coreboot/+/76496 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held Reviewed-by: Matt DeVillier --- src/soc/amd/common/Makefile.inc | 3 ++- src/soc/amd/genoa/Makefile.inc | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/soc/amd/common/Makefile.inc b/src/soc/amd/common/Makefile.inc index 78ab4ff9bb..2259d01ee5 100644 --- a/src/soc/amd/common/Makefile.inc +++ b/src/soc/amd/common/Makefile.inc @@ -53,7 +53,8 @@ amdfw_offset=$(call int-subtract, \ add_bootblock = \ $(CBFSTOOL) $(1) add -f $(2) -n apu/amdfw -t amdfw \ - -b $(amdfw_offset) -r $(call regions-for-file,apu/amdfw) + -b $(amdfw_offset) -r $(call regions-for-file,apu/amdfw) \ + $(CBFSTOOL_ADD_CMD_OPTIONS) endif # ifeq ($(CONFIG_RESET_VECTOR_IN_RAM),y) diff --git a/src/soc/amd/genoa/Makefile.inc b/src/soc/amd/genoa/Makefile.inc index 01b1965b04..7523b6824c 100644 --- a/src/soc/amd/genoa/Makefile.inc +++ b/src/soc/amd/genoa/Makefile.inc @@ -10,4 +10,8 @@ ramstage-y += timer.c CPPFLAGS_common += -I$(src)/soc/amd/genoa/include +ifeq ($(call int-gt, $(CONFIG_ROM_SIZE) 0x1000000), 1) +CBFSTOOL_ADD_CMD_OPTIONS+= --mmap 0:0xff000000:0x1000000 +endif + endif -- cgit v1.2.3