x86 cache-as-ram: Remove BROKEN_CAR_MIGRATE option

This was added to handle cases of Intel FSP platforms that had
EARLY_CBMEM_INIT but could not migrate CAR variables to CBMEM.
These boards were recently fixed.

To support combination of EARLY_CBMEM_INIT without CAR migration was
added maintenance effort with little benefits. You had no CBMEM
console for romstage and the few timestamps you could store were
circulated via PCI scratchpads or CMOS nvram.

Change-Id: I5cffb7f2b14c45b67ee70cf48be4d7a4c9e5f761
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/8636
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@google.com>
This commit is contained in:
Kyösti Mälkki 2015-03-10 07:25:35 +02:00
parent f48b38b8d7
commit a63719407f
9 changed files with 3 additions and 18 deletions

View File

@ -51,16 +51,8 @@ config ROMCC
bool
default n
config BROKEN_CAR_MIGRATE
def_bool n
help
Many boards use CAR_GLOBAL but have no EARLY_CBMEM_INIT and
manage CAR migration on S3 resume path only. Couple boards use
CAR_GLOBAL and never do CAR migration.
config LATE_CBMEM_INIT
def_bool n
select BROKEN_CAR_MIGRATE
help
Enable this in chipset's Kconfig if northbridge does not implement
early get_top_of_ram() call for romstage. CBMEM tables will be

View File

@ -186,7 +186,7 @@ config CONSOLE_CBMEM_BUFFER_SIZE
config CONSOLE_PRERAM_BUFFER_BASE
hex
default 0xabadbeef if !CACHE_AS_RAM || BROKEN_CAR_MIGRATE
default 0xabadbeef if !CACHE_AS_RAM || LATE_CBMEM_INIT
default 0x0
config CONSOLE_PRERAM_BUFFER_SIZE

View File

@ -34,7 +34,6 @@ config CPU_AMD_AGESA
select TSC_SYNC_LFENCE
select UDELAY_LAPIC
select LAPIC_MONOTONIC_TIMER
select BROKEN_CAR_MIGRATE
select SPI_FLASH if HAVE_ACPI_RESUME
if CPU_AMD_AGESA

View File

@ -29,7 +29,6 @@ config CPU_AMD_PI
select TSC_SYNC_LFENCE
select UDELAY_LAPIC
select LAPIC_MONOTONIC_TIMER
select BROKEN_CAR_MIGRATE
select SPI_FLASH if HAVE_ACPI_RESUME
if CPU_AMD_PI

View File

@ -6,7 +6,6 @@ config CPU_INTEL_EP80579
select ARCH_RAMSTAGE_X86_32
select SSE
select SUPPORT_CPU_UCODE_IN_CBFS
select BROKEN_CAR_MIGRATE
if CPU_INTEL_EP80579

View File

@ -149,9 +149,8 @@ static void do_car_migrate_hooks(void)
void car_migrate_variables(void)
{
if (!IS_ENABLED(CONFIG_BROKEN_CAR_MIGRATE) && !IS_ENABLED(PLATFORM_USES_FSP))
if (!IS_ENABLED(PLATFORM_USES_FSP))
do_car_migrate_variables();
if (!IS_ENABLED(CONFIG_BROKEN_CAR_MIGRATE))
do_car_migrate_hooks();
do_car_migrate_hooks();
}

View File

@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_PIRQ_TABLE
select DRIVERS_I2C_W83793
select DRIVERS_GENERIC_IOAPIC
select BROKEN_CAR_MIGRATE
config MAINBOARD_DIR
string

View File

@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select UDELAY_LAPIC
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024
select BROKEN_CAR_MIGRATE
config MAINBOARD_DIR
string

View File

@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_PIRQ_TABLE
select DRIVERS_I2C_W83793
select DRIVERS_GENERIC_IOAPIC
select BROKEN_CAR_MIGRATE
config MAINBOARD_DIR
string