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