13 files changed, 12 insertions, 33 deletions
diff --git a/src/arch/x86/init/bootblock.ld b/src/arch/x86/init/bootblock.ld
index bde0430059..fd4d3db960 100644
--- a/src/arch/x86/init/bootblock.ld
+++ b/src/arch/x86/init/bootblock.ld
@@ -51,5 +51,5 @@ SECTIONS
 		*(.eh_frame);
 	}
 
-	_bogus = ASSERT((SIZEOF(.bss) + SIZEOF(.data)) == 0 || CONFIG_AMD_AGESA, "Do not use global variables in romstage");
+	_bogus = ASSERT((SIZEOF(.bss) + SIZEOF(.data)) == 0 || CONFIG_CPU_AMD_AGESA, "Do not use global variables in romstage");
 }
diff --git a/src/cpu/amd/Makefile.inc b/src/cpu/amd/Makefile.inc
index 2ea376a2f8..6663d14301 100644
--- a/src/cpu/amd/Makefile.inc
+++ b/src/cpu/amd/Makefile.inc
@@ -14,4 +14,4 @@ subdirs-$(CONFIG_CPU_AMD_GEODE_LX) += geode_lx
 subdirs-$(CONFIG_CPU_AMD_SC520) += sc520
 subdirs-$(CONFIG_CPU_AMD_SOCKET_S1G1) += socket_S1G1
 
-subdirs-$(CONFIG_AMD_AGESA) += agesa
+subdirs-$(CONFIG_CPU_AMD_AGESA) += agesa
diff --git a/src/cpu/amd/agesa/Kconfig b/src/cpu/amd/agesa/Kconfig
index f8a8c3fca6..18f74e8927 100644
--- a/src/cpu/amd/agesa/Kconfig
+++ b/src/cpu/amd/agesa/Kconfig
@@ -17,12 +17,15 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-config AMD_AGESA
+config CPU_AMD_AGESA
         bool
+        default y if CPU_AMD_AGESA_FAMILY10
+        default y if CPU_AMD_AGESA_FAMILY12
+        default y if CPU_AMD_AGESA_FAMILY14
         default y if CPU_AMD_AGESA_FAMILY15
         default n
 
-if AMD_AGESA
+if CPU_AMD_AGESA
 
 config XIP_ROM_SIZE
 	hex
@@ -40,5 +43,5 @@ source src/cpu/amd/agesa/family12/Kconfig
 source src/cpu/amd/agesa/family14/Kconfig
 source src/cpu/amd/agesa/family15/Kconfig
 
-endif # AMD_AGESA
+endif # CPU_AMD_AGESA
 
diff --git a/src/mainboard/advansus/a785e-i/Makefile.inc b/src/mainboard/advansus/a785e-i/Makefile.inc
index 737bb1c1eb..d69a9bf869 100755
--- a/src/mainboard/advansus/a785e-i/Makefile.inc
+++ b/src/mainboard/advansus/a785e-i/Makefile.inc
@@ -3,7 +3,7 @@
 ramstage-y += reset.c
 
 #SB800 CIMx share AGESA V5 lib code
-ifneq ($(CONFIG_AMD_AGESA),y)
+ifneq ($(CONFIG_CPU_AMD_AGESA),y)
  AGESA_ROOT ?= src/vendorcode/amd/agesa/f14
  romstage-y += ../../../../$(AGESA_ROOT)/Lib/amdlib.c
  ramstage-y += ../../../../$(AGESA_ROOT)/Lib/amdlib.c
diff --git a/src/mainboard/amd/inagua/Kconfig b/src/mainboard/amd/inagua/Kconfig
index a5920af57d..bd8a184fce 100644
--- a/src/mainboard/amd/inagua/Kconfig
+++ b/src/mainboard/amd/inagua/Kconfig
@@ -43,10 +43,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select ENABLE_APIC_EXT_ID
 	select GFXUMA
 
-config AMD_AGESA
-	bool
-	default y
-
 config MAINBOARD_DIR
 	string
 	default amd/inagua
diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig
index e01e10121f..9212e20bd1 100644
--- a/src/mainboard/amd/persimmon/Kconfig
+++ b/src/mainboard/amd/persimmon/Kconfig
@@ -42,10 +42,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select BOARD_ROMSIZE_KB_4096
 	select GFXUMA
 
-config AMD_AGESA
-	bool
-	default y
-
 config MAINBOARD_DIR
 	string
 	default amd/persimmon
diff --git a/src/mainboard/amd/south_station/Kconfig b/src/mainboard/amd/south_station/Kconfig
index fb41cec4fe..2853978ad5 100644
--- a/src/mainboard/amd/south_station/Kconfig
+++ b/src/mainboard/amd/south_station/Kconfig
@@ -43,10 +43,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select GFXUMA
 	select UDELAY_LAPIC
 
-config AMD_AGESA
-	bool
-	default y
-
 config MAINBOARD_DIR
 	string
 	default amd/south_station
diff --git a/src/mainboard/amd/torpedo/Kconfig b/src/mainboard/amd/torpedo/Kconfig
index f36827967c..bc4030c037 100755
--- a/src/mainboard/amd/torpedo/Kconfig
+++ b/src/mainboard/amd/torpedo/Kconfig
@@ -45,10 +45,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
   select ENABLE_APIC_EXT_ID
         select GFXUMA
 
-config AMD_AGESA
-        bool
-        default y
-
 config MAINBOARD_DIR
         string
         default amd/torpedo
diff --git a/src/mainboard/amd/union_station/Kconfig b/src/mainboard/amd/union_station/Kconfig
index cc2e300147..b67736b5a4 100644
--- a/src/mainboard/amd/union_station/Kconfig
+++ b/src/mainboard/amd/union_station/Kconfig
@@ -42,10 +42,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select GFXUMA
 	select UDELAY_LAPIC
 
-config AMD_AGESA
-	bool
-	default y
-
 config MAINBOARD_DIR
 	string
 	default amd/union_station
diff --git a/src/mainboard/asrock/e350m1/Kconfig b/src/mainboard/asrock/e350m1/Kconfig
index 8324fa458e..edeae21905 100644
--- a/src/mainboard/asrock/e350m1/Kconfig
+++ b/src/mainboard/asrock/e350m1/Kconfig
@@ -43,10 +43,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
   select BOARD_ROMSIZE_KB_4096
         select GFXUMA
 
-config AMD_AGESA
-        bool
-        default y
-
 config MAINBOARD_DIR
         string
         default asrock/e350m1
diff --git a/src/mainboard/asus/m5a88-v/Makefile.inc b/src/mainboard/asus/m5a88-v/Makefile.inc
index b55a0c74d0..35b20430c6 100644
--- a/src/mainboard/asus/m5a88-v/Makefile.inc
+++ b/src/mainboard/asus/m5a88-v/Makefile.inc
@@ -1,7 +1,7 @@
 ramstage-y += reset.c
 
 #SB800 CIMx share AGESA V5 lib code
-ifneq ($(CONFIG_AMD_AGESA),y)
+ifneq ($(CONFIG_CPU_AMD_AGESA),y)
  AGESA_ROOT ?= src/vendorcode/amd/agesa/f14
  romstage-y += ../../../../$(AGESA_ROOT)/Lib/amdlib.c
  ramstage-y += ../../../../$(AGESA_ROOT)/Lib/amdlib.c
diff --git a/src/mainboard/avalue/eax-785e/Makefile.inc b/src/mainboard/avalue/eax-785e/Makefile.inc
index 737bb1c1eb..d69a9bf869 100644
--- a/src/mainboard/avalue/eax-785e/Makefile.inc
+++ b/src/mainboard/avalue/eax-785e/Makefile.inc
@@ -3,7 +3,7 @@
 ramstage-y += reset.c
 
 #SB800 CIMx share AGESA V5 lib code
-ifneq ($(CONFIG_AMD_AGESA),y)
+ifneq ($(CONFIG_CPU_AMD_AGESA),y)
  AGESA_ROOT ?= src/vendorcode/amd/agesa/f14
  romstage-y += ../../../../$(AGESA_ROOT)/Lib/amdlib.c
  ramstage-y += ../../../../$(AGESA_ROOT)/Lib/amdlib.c
diff --git a/src/northbridge/amd/agesa/Kconfig b/src/northbridge/amd/agesa/Kconfig
index 8c0e7ab725..2ee921bb3a 100644
--- a/src/northbridge/amd/agesa/Kconfig
+++ b/src/northbridge/amd/agesa/Kconfig
@@ -19,7 +19,7 @@
 
 config NORTHBRIDGE_AMD_AGESA
         bool
-        default AMD_AGESA
+        default CPU_AMD_AGESA
 
 if NORTHBRIDGE_AMD_AGESA