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@gmail.com>
Reviewed-on: http://review.coreboot.org/792
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:40:56 +02:00 committed by Patrick Georgi
parent f5bb4771de
commit d11ca1d08d
13 changed files with 12 additions and 33 deletions

View File

@ -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");
}

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -19,7 +19,7 @@
config NORTHBRIDGE_AMD_AGESA
bool
default AMD_AGESA
default CPU_AMD_AGESA
if NORTHBRIDGE_AMD_AGESA