diff options
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/Kconfig | 4 | ||||
| -rw-r--r-- | src/cpu/amd/agesa/Kconfig | 1 | ||||
| -rw-r--r-- | src/cpu/amd/family_10h-family_15h/Kconfig | 1 | ||||
| -rw-r--r-- | src/cpu/amd/pi/Kconfig | 2 | ||||
| -rw-r--r-- | src/cpu/via/nano/Kconfig | 1 | ||||
| -rw-r--r-- | src/cpu/x86/Makefile.inc | 2 |
6 files changed, 6 insertions, 5 deletions
diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig index 6078022397..645767c796 100644 --- a/src/cpu/Kconfig +++ b/src/cpu/Kconfig @@ -10,12 +10,12 @@ config CACHE_AS_RAM bool default y -config NO_CAR_GLOBAL_MIGRATION +config CAR_GLOBAL_MIGRATION bool default n depends on CACHE_AS_RAM help - This option is selected if there is no need to migrate CAR globals. + This option is selected if there is need to migrate CAR globals. All stages which use CAR globals can directly access the variables from their linked addresses. diff --git a/src/cpu/amd/agesa/Kconfig b/src/cpu/amd/agesa/Kconfig index 4c5463cc8a..3261bce935 100644 --- a/src/cpu/amd/agesa/Kconfig +++ b/src/cpu/amd/agesa/Kconfig @@ -29,7 +29,6 @@ config CPU_AMD_AGESA select UDELAY_LAPIC select LAPIC_MONOTONIC_TIMER select SPI_FLASH if HAVE_ACPI_RESUME - select POSTCAR_STAGE select SMM_ASEG if CPU_AMD_AGESA diff --git a/src/cpu/amd/family_10h-family_15h/Kconfig b/src/cpu/amd/family_10h-family_15h/Kconfig index df6549987e..1039a8d6ae 100644 --- a/src/cpu/amd/family_10h-family_15h/Kconfig +++ b/src/cpu/amd/family_10h-family_15h/Kconfig @@ -9,6 +9,7 @@ config CPU_AMD_MODEL_10XXX select UDELAY_LAPIC select SUPPORT_CPU_UCODE_IN_CBFS select CPU_MICROCODE_MULTIPLE_FILES + select CAR_GLOBAL_MIGRATION select ACPI_HUGE_LOWMEM_BACKUP if CPU_AMD_MODEL_10XXX diff --git a/src/cpu/amd/pi/Kconfig b/src/cpu/amd/pi/Kconfig index a902089099..2725d768d4 100644 --- a/src/cpu/amd/pi/Kconfig +++ b/src/cpu/amd/pi/Kconfig @@ -28,7 +28,7 @@ config CPU_AMD_PI select UDELAY_LAPIC select LAPIC_MONOTONIC_TIMER select SPI_FLASH if HAVE_ACPI_RESUME - select POSTCAR_STAGE if !BINARYPI_LEGACY_WRAPPER + select CAR_GLOBAL_MIGRATION if BINARYPI_LEGACY_WRAPPER select SMM_ASEG if CPU_AMD_PI diff --git a/src/cpu/via/nano/Kconfig b/src/cpu/via/nano/Kconfig index de1c2155e5..8ddc572dd5 100644 --- a/src/cpu/via/nano/Kconfig +++ b/src/cpu/via/nano/Kconfig @@ -30,6 +30,7 @@ config CPU_SPECIFIC_OPTIONS select MMX select SSE2 select SUPPORT_CPU_UCODE_IN_CBFS + select CAR_GLOBAL_MIGRATION config DCACHE_RAM_BASE hex diff --git a/src/cpu/x86/Makefile.inc b/src/cpu/x86/Makefile.inc index 65c092133f..8a669bdb66 100644 --- a/src/cpu/x86/Makefile.inc +++ b/src/cpu/x86/Makefile.inc @@ -1,5 +1,5 @@ ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32)$(CONFIG_ARCH_ROMSTAGE_X86_64),y) -ifneq ($(CONFIG_NO_CAR_GLOBAL_MIGRATION),y) +ifeq ($(CONFIG_CAR_GLOBAL_MIGRATION),y) romstage-$(CONFIG_CACHE_AS_RAM) += car.c endif endif |