diff --git a/src/soc/amd/cezanne/Kconfig b/src/soc/amd/cezanne/Kconfig
index 452e3ec354..3700f18772 100644
--- a/src/soc/amd/cezanne/Kconfig
+++ b/src/soc/amd/cezanne/Kconfig
@@ -22,6 +22,7 @@ config SOC_AMD_CEZANNE
 	select PLATFORM_USES_FSP2_0
 	select PROVIDES_ROM_SHARING
 	select PSP_VERSTAGE_CCP_DMA if VBOOT_STARTS_BEFORE_BOOTBLOCK
+	select PSP_VERSTAGE_MAP_ENTIRE_SPIROM if VBOOT_STARTS_BEFORE_BOOTBLOCK
 	select RESET_VECTOR_IN_RAM
 	select RTC
 	select SOC_AMD_COMMON
diff --git a/src/soc/amd/common/psp_verstage/Kconfig b/src/soc/amd/common/psp_verstage/Kconfig
index 118ef613d3..f670291ff6 100644
--- a/src/soc/amd/common/psp_verstage/Kconfig
+++ b/src/soc/amd/common/psp_verstage/Kconfig
@@ -46,7 +46,6 @@ config PSP_VERSTAGE_STACK_IS_MAPPED
 
 config PSP_VERSTAGE_MAP_ENTIRE_SPIROM
 	bool
-	default y if SOC_AMD_CEZANNE
 	default n
 	help
 	  This configuration indicates whether PSP Verstage needs to map the entire SPI ROM.