Rename AMD_AGESA to CPU_AMD_AGESA

Also any CPU_AMD_AGESA_FAMILYxx selects CPU_AMD_AGESA, so remove
the explicit selects from the mainboards.

Change-Id: I4d71726bccd446b0f4db4e26448b5c91e406a641
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/792
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>

diff --git a/src/arch/x86/init/bootblock.ld b/src/arch/x86/init/bootblock.ld
index bde0430059aeb815481cd93d0387157600fad496..fd4d3db960381b84ad2602eaa591db65a59637ae 100644 (file)
--- 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 2ea376a2f865e3cc78ea48bbd28ee4dabd1cc5c9..6663d143016c9abbe88967cd0cc4df291f2764d1 100644 (file)
--- 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 f8a8c3fca620dd8d5ef692dcacffccbf84fae0c3..18f74e89276b9fff47a50b21603ebb2ee0177bfc 100644 (file)
--- 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 737bb1c1ebd169561e9c1678f191ec0b0bef12b3..d69a9bf869374e61220bd4207078e9ddb72decf4 100755 (executable)
--- 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 a5920af57dbf0726879a18ebb3e2f1e1a253011d..bd8a184fce0f123fa769a23cdd05fed88f4b7dd8 100644 (file)
--- 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 e01e10121fd0b07bacdfbe7ea71d5b55d57382e1..9212e20bd174bf014cb2b9dccee4bf59bad19b56 100644 (file)
--- 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 fb41cec4fed7b37ffeaea368f5563eed1873a7f0..2853978ad5a087180d8694f5713e865e999c04c3 100644 (file)
--- 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 f36827967c31783482a1e15f7136227371e37490..bc4030c0370aba9ae816ef5d539eea4a3ec55786 100755 (executable)
--- 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 cc2e3001472bec989ebf391ba61170558db18c1d..b67736b5a42578eb35742621b9d5d4687a125f82 100644 (file)
--- 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 8324fa458e1a5183d56275124a2606eb8a1f0e94..edeae2190530258ecbc3a8f2358ead03de07eb1a 100644 (file)
--- 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 b55a0c74d04ce7751faaf1f1634c8b2b102cffec..35b20430c691597a0c8cbaf890c0912447113a1a 100644 (file)
--- 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 737bb1c1ebd169561e9c1678f191ec0b0bef12b3..d69a9bf869374e61220bd4207078e9ddb72decf4 100644 (file)
--- 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 8c0e7ab7252d58e12744d35d79e128f0d2f68a68..2ee921bb3a316f452100e4a824f86d80474ddba7 100644 (file)
--- 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