[coreboot] New patch to review for coreboot: bb5e0c2 Rename AMD_AGESA to CPU_AMD_AGESA
Kyösti Mälkki (kyosti.malkki@gmail.com)
gerrit at coreboot.org
Fri Mar 16 15:25:07 CET 2012
Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/792
-gerrit
commit bb5e0c247059617f80f7454900b1d9148ca3b35a
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date: Fri Mar 16 15:40:56 2012 +0200
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 at gmail.com>
---
src/arch/x86/init/bootblock.ld | 2 +-
src/cpu/amd/Makefile.inc | 2 +-
src/cpu/amd/agesa/Kconfig | 9 ++++++---
src/mainboard/advansus/a785e-i/Makefile.inc | 2 +-
src/mainboard/amd/inagua/Kconfig | 4 ----
src/mainboard/amd/persimmon/Kconfig | 4 ----
src/mainboard/amd/south_station/Kconfig | 4 ----
src/mainboard/amd/torpedo/Kconfig | 4 ----
src/mainboard/amd/union_station/Kconfig | 4 ----
src/mainboard/asrock/e350m1/Kconfig | 4 ----
src/mainboard/asus/m5a88-v/Makefile.inc | 2 +-
src/mainboard/avalue/eax-785e/Makefile.inc | 2 +-
src/northbridge/amd/agesa/Kconfig | 2 +-
13 files changed, 12 insertions(+), 33 deletions(-)
diff --git a/src/arch/x86/init/bootblock.ld b/src/arch/x86/init/bootblock.ld
index bde0430..fd4d3db 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 2ea376a..6663d14 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 f8a8c3f..18f74e8 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 737bb1c..d69a9bf 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 a5920af..bd8a184 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 e01e101..9212e20 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 fb41cec..2853978 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 f368279..bc4030c 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 cc2e300..b67736b 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 8324fa4..edeae21 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 b55a0c7..35b2043 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 737bb1c..d69a9bf 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 8c0e7ab..2ee921b 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
More information about the coreboot
mailing list