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>

diff --git a/src/cpu/amd/agesa/Kconfig b/src/cpu/amd/agesa/Kconfig
index 631724b04a3103d2f41b320b596d2147aefd62d4..f8a8c3fca620dd8d5ef692dcacffccbf84fae0c3 100644 (file)
--- 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 0f2f920256eb8e93408d323740cb6c9835af01a8..c1528f63a0d1279949eb32617cca8a90575b5221 100644 (file)
--- 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 c438473b01c0a8fdc5c953b21c70f203a04cce44..7e85d08066d403eb13beca0beb90de52cebce4c3 100644 (file)
--- 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 2ed9fd53095eac7462df0139ef91fc44aa51a1f3..8c0e7ab7252d58e12744d35d79e128f0d2f68a68 100644 (file)
--- 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