diff --git a/src/soc/amd/common/block/spi/Kconfig b/src/soc/amd/common/block/spi/Kconfig
index e5f68578b0..88b118276c 100644
--- a/src/soc/amd/common/block/spi/Kconfig
+++ b/src/soc/amd/common/block/spi/Kconfig
@@ -16,6 +16,18 @@ config SOC_AMD_COMMON_BLOCK_SPI_4DW_BURST
 	help
 	  Select this option to keep the 4 DWORD burst support enabled.
 
+config SOC_AMD_COMMON_BLOCK_SPI_MMAP
+	def_bool y
+	select X86_CUSTOM_BOOTMEDIA
+	depends on SOC_AMD_COMMON_BLOCK_SPI
+	depends on !SOC_AMD_COMMON_BLOCK_LPC_SPI_DMA
+	help
+	  This option is required when CONFIG_ROM_SIZE is greater than 16 MiB.
+	  This flash driver still only mmaps 16 MiB of the flash (depending
+	  on SPI straps either the upper or lower part, by default the lower).
+	  Developers must take care to place all x86 accessible firmware
+	  components in the mmap area.
+
 config EFS_SPI_READ_MODE
 	int
 	range 0 7
diff --git a/src/soc/amd/common/block/spi/Makefile.mk b/src/soc/amd/common/block/spi/Makefile.mk
index 55ca308c02..b80e204ec3 100644
--- a/src/soc/amd/common/block/spi/Makefile.mk
+++ b/src/soc/amd/common/block/spi/Makefile.mk
@@ -1,6 +1,9 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_SPI),y)
 
+all_x86-$(CONFIG_SOC_AMD_COMMON_BLOCK_SPI_MMAP) += mmap_boot.c
+smm-$(CONFIG_SOC_AMD_COMMON_BLOCK_SPI_MMAP) += mmap_boot.c
+
 bootblock-y += fch_spi_ctrl.c
 romstage-y += fch_spi_ctrl.c
 verstage-y += fch_spi_ctrl.c
diff --git a/src/soc/amd/genoa_poc/mmap_boot.c b/src/soc/amd/common/block/spi/mmap_boot.c
similarity index 100%
rename from src/soc/amd/genoa_poc/mmap_boot.c
rename to src/soc/amd/common/block/spi/mmap_boot.c
diff --git a/src/soc/amd/genoa_poc/Kconfig b/src/soc/amd/genoa_poc/Kconfig
index 25dd914bcf..3e7246b679 100644
--- a/src/soc/amd/genoa_poc/Kconfig
+++ b/src/soc/amd/genoa_poc/Kconfig
@@ -41,6 +41,7 @@ config SOC_SPECIFIC_OPTIONS
 	select SOC_AMD_COMMON_BLOCK_SMM
 	select SOC_AMD_COMMON_BLOCK_SMU
 	select SOC_AMD_COMMON_BLOCK_SMU_SX_ENTRY
+	select SOC_AMD_COMMON_BLOCK_SPI
 	select SOC_AMD_COMMON_BLOCK_SVI3
 	select SOC_AMD_COMMON_BLOCK_TSC
 	select SOC_AMD_COMMON_BLOCK_UART
@@ -49,7 +50,6 @@ config SOC_SPECIFIC_OPTIONS
 	select SOC_AMD_OPENSIL
 	select SOC_AMD_OPENSIL_GENOA_POC
 	select OPENSIL_DRIVER
-	select X86_CUSTOM_BOOTMEDIA
 
 config USE_X86_64_SUPPORT
 	default y
diff --git a/src/soc/amd/genoa_poc/Makefile.mk b/src/soc/amd/genoa_poc/Makefile.mk
index bde8b1843f..73f10a8a44 100644
--- a/src/soc/amd/genoa_poc/Makefile.mk
+++ b/src/soc/amd/genoa_poc/Makefile.mk
@@ -1,7 +1,6 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 ifeq ($(CONFIG_SOC_AMD_GENOA_POC),y)
 
-all-y		+= mmap_boot.c
 all-y		+= reset.c
 all-y		+= config.c
 all-y		+= gpio.c