summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2012-03-16 15:15:20 +0200
committerPatrick Georgi <patrick@georgi-clan.de>2012-03-16 22:39:09 +0100
commitf5bb4771dee06c132aa7d15917c69cd34b2a7ec9 (patch)
tree600e4747bb2fd534406b90e16730d22832f1caa4
parent1c93d90fd2c87e778e4d9a57ccfa341fd00d3d80 (diff)
downloadcoreboot-f5bb4771dee06c132aa7d15917c69cd34b2a7ec9.tar.xz
Fix AMD Agesa leaking Kconfig
Kconfig leaked XIP_ROM_SIZE to other platforms and also defined obsolete option XIP_ROM_BASE. Alias AMD_AGESA as NORTHBRIDGE_AMD_AGESA. Break the circular dependency with family15 Kconfig. Change-Id: Ic7891012220e1bef758a5a39002b66971d5206e3 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/773 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
-rw-r--r--src/cpu/amd/agesa/Kconfig8
-rw-r--r--src/cpu/amd/agesa/family15/Kconfig5
-rw-r--r--src/northbridge/amd/Makefile.inc2
-rw-r--r--src/northbridge/amd/agesa/Kconfig7
4 files changed, 13 insertions, 9 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
diff --git a/src/northbridge/amd/Makefile.inc b/src/northbridge/amd/Makefile.inc
index c438473b01..7e85d08066 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 2ed9fd5309..8c0e7ab725 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 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