sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix AMD Agesa leaking Kconfig

Browse Source 
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>
This commit is contained in:
Kyösti Mälkki
2012-03-16 15:15:20 +02:00
committed by Patrick Georgi
parent 1c93d90fd2
commit f5bb4771de
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cpu/amd/agesa/Kconfig
View File

@@ -19,11 +19,10 @@
config AMD_AGESA config AMD_AGESA
bool bool
default y if CPU_AMD_AGESA_FAMILY15
default n default n
config XIP_ROM_BASE if AMD_AGESA
hex
default 0xfff00000
config XIP_ROM_SIZE config XIP_ROM_SIZE
hex hex
@@ -40,3 +39,6 @@ source src/cpu/amd/agesa/family10/Kconfig
source src/cpu/amd/agesa/family12/Kconfig source src/cpu/amd/agesa/family12/Kconfig
source src/cpu/amd/agesa/family14/Kconfig source src/cpu/amd/agesa/family14/Kconfig
source src/cpu/amd/agesa/family15/Kconfig source src/cpu/amd/agesa/family15/Kconfig
endif # AMD_AGESA

5
src/cpu/amd/agesa/family15/Kconfig
View File

@@ -20,7 +20,6 @@
config CPU_AMD_AGESA_FAMILY15 config CPU_AMD_AGESA_FAMILY15
bool bool
select PCI_IO_CFG_EXT select PCI_IO_CFG_EXT
select AMD_AGESA
if CPU_AMD_AGESA_FAMILY15 if CPU_AMD_AGESA_FAMILY15
@@ -58,10 +57,6 @@ config CDB
hex hex
default 0x18 default 0x18
config XIP_ROM_BASE
hex
default 0xfff80000
config XIP_ROM_SIZE config XIP_ROM_SIZE
hex hex
default 0x80000 default 0x80000

2
src/northbridge/amd/Makefile.inc
View File

@@ -3,6 +3,6 @@ subdirs-$(CONFIG_NORTHBRIDGE_AMD_AMDK8) += amdk8
subdirs-$(CONFIG_NORTHBRIDGE_AMD_GX1) += gx1 subdirs-$(CONFIG_NORTHBRIDGE_AMD_GX1) += gx1
subdirs-$(CONFIG_NORTHBRIDGE_AMD_GX2) += gx2 subdirs-$(CONFIG_NORTHBRIDGE_AMD_GX2) += gx2
subdirs-$(CONFIG_NORTHBRIDGE_AMD_LX) += lx subdirs-$(CONFIG_NORTHBRIDGE_AMD_LX) += lx
subdirs-$(CONFIG_NORTHBRIDGE_AMD_AGESA) += agesa
subdirs-$(CONFIG_AMD_AGESA) += agesa
subdirs-$(CONFIG_AMD_NB_CIMX) += cimx subdirs-$(CONFIG_AMD_NB_CIMX) += cimx

7
src/northbridge/amd/agesa/Kconfig
View File

@@ -17,6 +17,12 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # 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 config CONSOLE_VGA_MULTI
bool bool
default n 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/family14/Kconfig
source src/northbridge/amd/agesa/family15/Kconfig source src/northbridge/amd/agesa/family15/Kconfig
endif # NORTHBRIDGE_AMD_AGESA