summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/arch/x86/Kconfig8
-rw-r--r--src/console/Kconfig2
-rw-r--r--src/cpu/amd/agesa/Kconfig1
-rw-r--r--src/cpu/amd/pi/Kconfig1
-rw-r--r--src/cpu/intel/ep80579/Kconfig1
-rw-r--r--src/cpu/x86/car.c5
-rw-r--r--src/mainboard/asus/dsbf/Kconfig1
-rw-r--r--src/mainboard/iwave/iWRainbowG6/Kconfig1
-rw-r--r--src/mainboard/supermicro/x7db8/Kconfig1
9 files changed, 3 insertions, 18 deletions
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index dfb91fad8e..20876192b9 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -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
diff --git a/src/console/Kconfig b/src/console/Kconfig
index 2969c0fb64..26e0866ffe 100644
--- a/src/console/Kconfig
+++ b/src/console/Kconfig
@@ -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
diff --git a/src/cpu/amd/agesa/Kconfig b/src/cpu/amd/agesa/Kconfig
index 2aeb8d758f..84d50c82f3 100644
--- a/src/cpu/amd/agesa/Kconfig
+++ b/src/cpu/amd/agesa/Kconfig
@@ -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
diff --git a/src/cpu/amd/pi/Kconfig b/src/cpu/amd/pi/Kconfig
index 3fa62636fa..6702a19a3d 100644
--- a/src/cpu/amd/pi/Kconfig
+++ b/src/cpu/amd/pi/Kconfig
@@ -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
diff --git a/src/cpu/intel/ep80579/Kconfig b/src/cpu/intel/ep80579/Kconfig
index 5d90611f29..062f10167c 100644
--- a/src/cpu/intel/ep80579/Kconfig
+++ b/src/cpu/intel/ep80579/Kconfig
@@ -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
diff --git a/src/cpu/x86/car.c b/src/cpu/x86/car.c
index 9f1a26e3d3..18d74b25c7 100644
--- a/src/cpu/x86/car.c
+++ b/src/cpu/x86/car.c
@@ -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();
}
diff --git a/src/mainboard/asus/dsbf/Kconfig b/src/mainboard/asus/dsbf/Kconfig
index c130a9f96a..481d4fa1d8 100644
--- a/src/mainboard/asus/dsbf/Kconfig
+++ b/src/mainboard/asus/dsbf/Kconfig
@@ -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
diff --git a/src/mainboard/iwave/iWRainbowG6/Kconfig b/src/mainboard/iwave/iWRainbowG6/Kconfig
index e9ecede440..7bca220f81 100644
--- a/src/mainboard/iwave/iWRainbowG6/Kconfig
+++ b/src/mainboard/iwave/iWRainbowG6/Kconfig
@@ -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
diff --git a/src/mainboard/supermicro/x7db8/Kconfig b/src/mainboard/supermicro/x7db8/Kconfig
index f5b0e112b4..82a4ebb27e 100644
--- a/src/mainboard/supermicro/x7db8/Kconfig
+++ b/src/mainboard/supermicro/x7db8/Kconfig
@@ -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