diff --git a/src/cpu/amd/agesa/Kconfig b/src/cpu/amd/agesa/Kconfig
index f21bf54..b1fde2d 100644
--- a/src/cpu/amd/agesa/Kconfig
+++ b/src/cpu/amd/agesa/Kconfig
@@ -28,20 +28,10 @@
 	select LAPIC_MONOTONIC_TIMER
 	select SPI_FLASH if HAVE_ACPI_RESUME
 	select SMM_ASEG
+	select NO_FIXED_XIP_ROM_SIZE
 
 if CPU_AMD_AGESA
 
-config XIP_ROM_SIZE
-	hex
-	default 0x100000
-	help
-	  Overwride the default write through caching size as 1M Bytes.
-	  On some AMD platforms, one socket supports 2 or more kinds of
-	  processor family, compiling several CPU families agesa code
-	  will increase the romstage size.
-	  In order to execute romstage in place on the flash ROM,
-	  more space is required to be set as write through caching.
-
 config UDELAY_LAPIC_FIXED_FSB
 	int
 	default 200
diff --git a/src/cpu/amd/agesa/family12/Kconfig b/src/cpu/amd/agesa/family12/Kconfig
index 4fc2ba07..0324d12 100644
--- a/src/cpu/amd/agesa/family12/Kconfig
+++ b/src/cpu/amd/agesa/family12/Kconfig
@@ -21,8 +21,4 @@
 	int
 	default 48
 
-config XIP_ROM_SIZE
-	hex
-	default 0x80000
-
 endif
diff --git a/src/cpu/amd/agesa/family14/Kconfig b/src/cpu/amd/agesa/family14/Kconfig
index adbe7fd..518235b 100644
--- a/src/cpu/amd/agesa/family14/Kconfig
+++ b/src/cpu/amd/agesa/family14/Kconfig
@@ -21,8 +21,4 @@
 	int
 	default 36
 
-config XIP_ROM_SIZE
-	hex
-	default 0x80000
-
 endif
diff --git a/src/cpu/amd/agesa/family15tn/Kconfig b/src/cpu/amd/agesa/family15tn/Kconfig
index fde1adf..93e9ab2 100644
--- a/src/cpu/amd/agesa/family15tn/Kconfig
+++ b/src/cpu/amd/agesa/family15tn/Kconfig
@@ -21,8 +21,4 @@
 	int
 	default 48
 
-config XIP_ROM_SIZE
-	hex
-	default 0x100000
-
 endif
diff --git a/src/cpu/amd/agesa/family16kb/Kconfig b/src/cpu/amd/agesa/family16kb/Kconfig
index 9fef94d..e87a2d4 100644
--- a/src/cpu/amd/agesa/family16kb/Kconfig
+++ b/src/cpu/amd/agesa/family16kb/Kconfig
@@ -21,10 +21,6 @@
 	int
 	default 40
 
-config XIP_ROM_SIZE
-	hex
-	default 0x100000
-
 config FORCE_AM1_SOCKET_SUPPORT
 	bool
 	default n
diff --git a/src/cpu/amd/pi/00630F01/Kconfig b/src/cpu/amd/pi/00630F01/Kconfig
index e5e27b5..37025ab 100644
--- a/src/cpu/amd/pi/00630F01/Kconfig
+++ b/src/cpu/amd/pi/00630F01/Kconfig
@@ -21,8 +21,4 @@
 	int
 	default 48
 
-config XIP_ROM_SIZE
-	hex
-	default 0x100000
-
 endif
diff --git a/src/cpu/amd/pi/00660F01/Kconfig b/src/cpu/amd/pi/00660F01/Kconfig
index 6470448..374672d 100644
--- a/src/cpu/amd/pi/00660F01/Kconfig
+++ b/src/cpu/amd/pi/00660F01/Kconfig
@@ -21,8 +21,4 @@
 	int
 	default 48
 
-config XIP_ROM_SIZE
-	hex
-	default 0x100000
-
 endif
diff --git a/src/cpu/amd/pi/00730F01/Kconfig b/src/cpu/amd/pi/00730F01/Kconfig
index 43abc80..7ba4943 100644
--- a/src/cpu/amd/pi/00730F01/Kconfig
+++ b/src/cpu/amd/pi/00730F01/Kconfig
@@ -23,8 +23,4 @@
 	int
 	default 40
 
-config XIP_ROM_SIZE
-	hex
-	default 0x100000
-
 endif
diff --git a/src/cpu/amd/pi/Kconfig b/src/cpu/amd/pi/Kconfig
index 973a086..b33302e 100644
--- a/src/cpu/amd/pi/Kconfig
+++ b/src/cpu/amd/pi/Kconfig
@@ -28,23 +28,13 @@
 	select SPI_FLASH if HAVE_ACPI_RESUME
 	select CAR_GLOBAL_MIGRATION if BINARYPI_LEGACY_WRAPPER
 	select SMM_ASEG
+	select NO_FIXED_XIP_ROM_SIZE
 
 if CPU_AMD_PI
 
 config BINARYPI_LEGACY_WRAPPER
 	def_bool n
 
-config XIP_ROM_SIZE
-	hex
-	default 0x100000
-	help
-	  Overwride the default write through caching size as 1M Bytes.
-	  On some AMD platforms, one socket supports 2 or more kinds of
-	  processor family, compiling several CPU families agesa code
-	  will increase the romstage size.
-	  In order to execute romstage in place on the flash ROM,
-	  more space is required to be set as write through caching.
-
 config UDELAY_LAPIC_FIXED_FSB
 	int
 	default 200