2 files changed, 5 insertions, 8 deletions
diff --git a/src/cpu/amd/agesa/Kconfig b/src/cpu/amd/agesa/Kconfig
index 631724b04a..f8a8c3fca6 100644
--- a/src/cpu/amd/agesa/Kconfig
+++ b/src/cpu/amd/agesa/Kconfig
@@ -19,11 +19,10 @@
 
 config AMD_AGESA
         bool
+        default y if CPU_AMD_AGESA_FAMILY15
         default n
 
-config XIP_ROM_BASE
-	hex
-	default 0xfff00000
+if AMD_AGESA
 
 config XIP_ROM_SIZE
 	hex
@@ -40,3 +39,6 @@ source src/cpu/amd/agesa/family10/Kconfig
 source src/cpu/amd/agesa/family12/Kconfig
 source src/cpu/amd/agesa/family14/Kconfig
 source src/cpu/amd/agesa/family15/Kconfig
+
+endif # AMD_AGESA
+
diff --git a/src/cpu/amd/agesa/family15/Kconfig b/src/cpu/amd/agesa/family15/Kconfig
index 0f2f920256..c1528f63a0 100644
--- a/src/cpu/amd/agesa/family15/Kconfig
+++ b/src/cpu/amd/agesa/family15/Kconfig
@@ -20,7 +20,6 @@
 config CPU_AMD_AGESA_FAMILY15
 	bool
 	select PCI_IO_CFG_EXT
-	select AMD_AGESA
 
 if CPU_AMD_AGESA_FAMILY15
 
@@ -58,10 +57,6 @@ config CDB
 	hex
 	default 0x18
 
-config XIP_ROM_BASE
-	hex
-	default 0xfff80000
-
 config XIP_ROM_SIZE
 	hex
 	default 0x80000