GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arch/x86: Obsolete CACHE_AS_RAM config 

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 <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34806
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Kyösti Mälkki 2019-08-09 09:11:14 +03:00
parent 0f5e01a962
commit c74b93df9f
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cpu/Kconfig
View File

@ -6,14 +6,9 @@ source "src/cpu/*/Kconfig"
if ARCH_X86 if ARCH_X86
config CACHE_AS_RAM
bool
default y
config CAR_GLOBAL_MIGRATION config CAR_GLOBAL_MIGRATION
bool bool
default n default n
depends on CACHE_AS_RAM
help help
This option is selected if there is 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 All stages which use CAR globals can directly access the variables

6
src/cpu/x86/Makefile.inc
View File

@ -1,8 +1,4 @@
ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32)$(CONFIG_ARCH_ROMSTAGE_X86_64),y) romstage-$(CONFIG_CAR_GLOBAL_MIGRATION) += car.c
ifeq ($(CONFIG_CAR_GLOBAL_MIGRATION),y)
romstage-$(CONFIG_CACHE_AS_RAM) += car.c
endif
endif
subdirs-y += pae subdirs-y += pae
subdirs-$(CONFIG_PARALLEL_MP) += name subdirs-$(CONFIG_PARALLEL_MP) += name

2
src/include/rules.h
View File

@ -284,7 +284,7 @@
/* x86 specific. Indicates that the current stage is running with cache-as-ram /* x86 specific. Indicates that the current stage is running with cache-as-ram
* enabled from the beginning of the stage in C code. */ * enabled from the beginning of the stage in C code. */
#if defined(__PRE_RAM__) #if defined(__PRE_RAM__)
#define ENV_CACHE_AS_RAM CONFIG(CACHE_AS_RAM) #define ENV_CACHE_AS_RAM CONFIG(ARCH_X86)
#else #else
#define ENV_CACHE_AS_RAM 0 #define ENV_CACHE_AS_RAM 0
#endif #endif

2
src/include/symbols.h
View File

@ -72,7 +72,7 @@ DECLARE_REGION(bl31)
* (Does not necessarily mean that the memory is accessible.) */ * (Does not necessarily mean that the memory is accessible.) */
static inline int preram_symbols_available(void) 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 */ #endif /* __SYMBOLS_H */