diff options
| -rw-r--r-- | src/cpu/Kconfig | 5 | ||||
| -rw-r--r-- | src/cpu/x86/Makefile.inc | 6 | ||||
| -rw-r--r-- | src/include/rules.h | 2 | ||||
| -rw-r--r-- | src/include/symbols.h | 2 |
4 files changed, 3 insertions, 12 deletions
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 diff --git a/src/include/rules.h b/src/include/rules.h index d8f6e7438b..10cd715db1 100644 --- a/src/include/rules.h +++ b/src/include/rules.h @@ -284,7 +284,7 @@ /* x86 specific. Indicates that the current stage is running with cache-as-ram * enabled from the beginning of the stage in C code. */ #if defined(__PRE_RAM__) -#define ENV_CACHE_AS_RAM CONFIG(CACHE_AS_RAM) +#define ENV_CACHE_AS_RAM CONFIG(ARCH_X86) #else #define ENV_CACHE_AS_RAM 0 #endif diff --git a/src/include/symbols.h b/src/include/symbols.h index cc27275f88..76c93202d0 100644 --- a/src/include/symbols.h +++ b/src/include/symbols.h @@ -72,7 +72,7 @@ DECLARE_REGION(bl31) * (Does not necessarily mean that the memory is accessible.) */ static inline int preram_symbols_available(void) { - return !CONFIG(CACHE_AS_RAM) || ENV_CACHE_AS_RAM; + return !CONFIG(ARCH_X86) || ENV_CACHE_AS_RAM; } #endif /* __SYMBOLS_H */ |