[coreboot] New patch to review for coreboot: 55312ae Fix AMD Agesa leaking Kconfig
Kyösti Mälkki (kyosti.malkki@gmail.com)
gerrit at coreboot.org
Thu Mar 8 00:08:26 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/773
-gerrit
commit 55312ae0554da57c7becaef099ef240b4904ee5b
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date: Wed Mar 7 23:21:35 2012 +0200
Fix AMD Agesa leaking Kconfig
Kconfig leaked XIP_ROM_SIZE to other platforms and also
defined obsolete option XIP_ROM_BASE.
Rename AMD_AGESA to CPU_AMD_AGESA.
Also alias CPU_AMD_AGESA as NORTHBRIDGE_AMD_AGESA.
Change-Id: Ic7891012220e1bef758a5a39002b66971d5206e3
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 | 10 ++++++----
src/cpu/amd/agesa/family15/Kconfig | 5 -----
src/mainboard/advansus/a785e-i/Makefile.inc | 2 +-
src/mainboard/amd/inagua/Kconfig | 5 +----
src/mainboard/amd/persimmon/Kconfig | 5 +----
src/mainboard/amd/south_station/Kconfig | 5 +----
src/mainboard/amd/torpedo/Kconfig | 5 +----
src/mainboard/amd/union_station/Kconfig | 5 +----
src/mainboard/asrock/e350m1/Kconfig | 5 +----
src/mainboard/asus/m5a88-v/Makefile.inc | 2 +-
src/mainboard/avalue/eax-785e/Makefile.inc | 2 +-
src/northbridge/amd/Makefile.inc | 2 +-
src/northbridge/amd/agesa/Kconfig | 7 +++++++
15 files changed, 25 insertions(+), 39 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 631724b..214aca3 100644
--- a/src/cpu/amd/agesa/Kconfig
+++ b/src/cpu/amd/agesa/Kconfig
@@ -17,13 +17,12 @@
# 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_FAMILY15
default n
-config XIP_ROM_BASE
- hex
- default 0xfff00000
+if CPU_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 # CPU_AMD_AGESA
+
diff --git a/src/cpu/amd/agesa/family15/Kconfig b/src/cpu/amd/agesa/family15/Kconfig
index 0f2f920..c1528f6 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
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..acc9e45 100644
--- a/src/mainboard/amd/inagua/Kconfig
+++ b/src/mainboard/amd/inagua/Kconfig
@@ -42,10 +42,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select BOARD_ROMSIZE_KB_2048
select ENABLE_APIC_EXT_ID
select GFXUMA
-
-config AMD_AGESA
- bool
- default y
+ select CPU_AMD_AGESA
config MAINBOARD_DIR
string
diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig
index e01e101..7cb5c16 100644
--- a/src/mainboard/amd/persimmon/Kconfig
+++ b/src/mainboard/amd/persimmon/Kconfig
@@ -41,10 +41,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_4096
select GFXUMA
-
-config AMD_AGESA
- bool
- default y
+ select CPU_AMD_AGESA
config MAINBOARD_DIR
string
diff --git a/src/mainboard/amd/south_station/Kconfig b/src/mainboard/amd/south_station/Kconfig
index fb41cec..69c4874 100644
--- a/src/mainboard/amd/south_station/Kconfig
+++ b/src/mainboard/amd/south_station/Kconfig
@@ -42,10 +42,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select BOARD_ROMSIZE_KB_4096
select GFXUMA
select UDELAY_LAPIC
-
-config AMD_AGESA
- bool
- default y
+ select CPU_AMD_AGESA
config MAINBOARD_DIR
string
diff --git a/src/mainboard/amd/torpedo/Kconfig b/src/mainboard/amd/torpedo/Kconfig
index f368279..1a45724 100755
--- a/src/mainboard/amd/torpedo/Kconfig
+++ b/src/mainboard/amd/torpedo/Kconfig
@@ -44,10 +44,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select BOARD_ROMSIZE_KB_2048
select ENABLE_APIC_EXT_ID
select GFXUMA
-
-config AMD_AGESA
- bool
- default y
+ select CPU_AMD_AGESA
config MAINBOARD_DIR
string
diff --git a/src/mainboard/amd/union_station/Kconfig b/src/mainboard/amd/union_station/Kconfig
index 194a39d..9c1a779 100644
--- a/src/mainboard/amd/union_station/Kconfig
+++ b/src/mainboard/amd/union_station/Kconfig
@@ -42,10 +42,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select BOARD_ROMSIZE_KB_2048
select GFXUMA
select UDELAY_LAPIC
-
-config AMD_AGESA
- bool
- default y
+ select CPU_AMD_AGESA
config MAINBOARD_DIR
string
diff --git a/src/mainboard/asrock/e350m1/Kconfig b/src/mainboard/asrock/e350m1/Kconfig
index 8324fa4..c8d5218 100644
--- a/src/mainboard/asrock/e350m1/Kconfig
+++ b/src/mainboard/asrock/e350m1/Kconfig
@@ -42,10 +42,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_4096
select GFXUMA
-
-config AMD_AGESA
- bool
- default y
+ select CPU_AMD_AGESA
config MAINBOARD_DIR
string
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/Makefile.inc b/src/northbridge/amd/Makefile.inc
index c438473..7e85d08 100644
--- a/src/northbridge/amd/Makefile.inc
+++ b/src/northbridge/amd/Makefile.inc
@@ -3,6 +3,6 @@ subdirs-$(CONFIG_NORTHBRIDGE_AMD_AMDK8) += amdk8
subdirs-$(CONFIG_NORTHBRIDGE_AMD_GX1) += gx1
subdirs-$(CONFIG_NORTHBRIDGE_AMD_GX2) += gx2
subdirs-$(CONFIG_NORTHBRIDGE_AMD_LX) += lx
+subdirs-$(CONFIG_NORTHBRIDGE_AMD_AGESA) += agesa
-subdirs-$(CONFIG_AMD_AGESA) += agesa
subdirs-$(CONFIG_AMD_NB_CIMX) += cimx
diff --git a/src/northbridge/amd/agesa/Kconfig b/src/northbridge/amd/agesa/Kconfig
index 2ed9fd5..2ee921b 100644
--- a/src/northbridge/amd/agesa/Kconfig
+++ b/src/northbridge/amd/agesa/Kconfig
@@ -17,6 +17,12 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
+config NORTHBRIDGE_AMD_AGESA
+ bool
+ default CPU_AMD_AGESA
+
+if NORTHBRIDGE_AMD_AGESA
+
config CONSOLE_VGA_MULTI
bool
default n
@@ -26,3 +32,4 @@ source src/northbridge/amd/agesa/family12/Kconfig
source src/northbridge/amd/agesa/family14/Kconfig
source src/northbridge/amd/agesa/family15/Kconfig
+endif # NORTHBRIDGE_AMD_AGESA
More information about the coreboot
mailing list