commit 926d55cddd3353993604e08a7eb5d7671fd87d2f
author Arthur Heymans <arthur@aheymans.xyz> Thu Jul 13 12:50:45 2023 +0200
committer Martin L Roth <gaumless@gmail.com> Mon Sep 04 23:49:47 2023 +0000
tree 5f2fc807b723770bd5b89947d32424f04e82a894
parent 6dadf7f4823a93a20d8ac7b24f93beea78f69c09

soc/amd/common: Use CBFSTOOL_ADD_CMD_OPTIONS when adding psp image

Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Change-Id: I639fb1e911a7449d0db0d2bfcfbb6f4f225b0cef
Reviewed-on: https://review.coreboot.org/c/coreboot/+/76496
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>

src/soc/amd/common/Makefile.inc

diff --git a/src/soc/amd/common/Makefile.inc b/src/soc/amd/common/Makefile.inc
index 78ab4ff..2259d01e 100644
--- a/src/soc/amd/common/Makefile.inc
+++ b/src/soc/amd/common/Makefile.inc
@@ -53,7 +53,8 @@
 
 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)
 

src/soc/amd/genoa/Makefile.inc

diff --git a/src/soc/amd/genoa/Makefile.inc b/src/soc/amd/genoa/Makefile.inc
index 01b1965..7523b68 100644
--- a/src/soc/amd/genoa/Makefile.inc
+++ b/src/soc/amd/genoa/Makefile.inc
@@ -10,4 +10,8 @@
 
 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