From c74b93df9fd03c6959227d99f8e37b0518ec9c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Fri, 9 Aug 2019 09:11:14 +0300 Subject: arch/x86: Obsolete CACHE_AS_RAM config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was originally inverse of romcc-built romstages on x86, and is currently always true on x86. Change-Id: I65fa6b3ce8a86781724bbf08f5eadee4112667c4 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/34806 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/cpu/Kconfig | 5 ----- src/cpu/x86/Makefile.inc | 6 +----- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'src/cpu') diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig index 645767c796..69ceb647ee 100644 --- a/src/cpu/Kconfig +++ b/src/cpu/Kconfig @@ -6,14 +6,9 @@ source "src/cpu/*/Kconfig" if ARCH_X86 -config CACHE_AS_RAM - bool - default y - config CAR_GLOBAL_MIGRATION bool default n - depends on CACHE_AS_RAM help This option is selected if there is need to migrate CAR globals. All stages which use CAR globals can directly access the variables diff --git a/src/cpu/x86/Makefile.inc b/src/cpu/x86/Makefile.inc index 8a669bdb66..9c18d44945 100644 --- a/src/cpu/x86/Makefile.inc +++ b/src/cpu/x86/Makefile.inc @@ -1,8 +1,4 @@ -ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32)$(CONFIG_ARCH_ROMSTAGE_X86_64),y) -ifeq ($(CONFIG_CAR_GLOBAL_MIGRATION),y) -romstage-$(CONFIG_CACHE_AS_RAM) += car.c -endif -endif +romstage-$(CONFIG_CAR_GLOBAL_MIGRATION) += car.c subdirs-y += pae subdirs-$(CONFIG_PARALLEL_MP) += name -- cgit v1.2.3