summaryrefslogtreecommitdiff
path: root/src/security/memory
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2020-07-02 21:48:38 +0300
committerPatrick Georgi <pgeorgi@google.com>2020-07-06 06:17:47 +0000
commit18a8ba41cc748c4c85fb2d9b0314dbc87c2003c1 (patch)
treef54881cde95e01ce3eedd9969bdcecd6008a8a7f /src/security/memory
parent7c040adc8c5aa00fabd315296aff4e70d5f03f7e (diff)
arch/x86: Remove RELOCATABLE_RAMSTAGE
We always have it, no need to support opting-out. For PLATFORM_HAS_DRAM_CLEAR there is a dependency of ramstage located inside CBMEM, which is only true with ARCH_X86. Change-Id: I5cbf4063c69571db92de2d321c14d30c272e8098 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/43014 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Nico Huber <nico.h@gmx.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/security/memory')
-rw-r--r--src/security/memory/Kconfig5
-rw-r--r--src/security/memory/memory_clear.c3
2 files changed, 3 insertions, 5 deletions
diff --git a/src/security/memory/Kconfig b/src/security/memory/Kconfig
index 5104f34069..d3dec043df 100644
--- a/src/security/memory/Kconfig
+++ b/src/security/memory/Kconfig
@@ -4,9 +4,8 @@ menu "Memory initialization"
config PLATFORM_HAS_DRAM_CLEAR
bool
- default y if ARCH_X86
- default n
- depends on RELOCATABLE_RAMSTAGE
+ default y
+ depends on ARCH_X86
help
Selected by platforms that support clearing all DRAM
after DRAM initialization.
diff --git a/src/security/memory/memory_clear.c b/src/security/memory/memory_clear.c
index 031ca84abe..557125dcf8 100644
--- a/src/security/memory/memory_clear.c
+++ b/src/security/memory/memory_clear.c
@@ -77,8 +77,7 @@ static void clear_memory(void *unused)
void *baseptr = NULL;
size_t size = 0;
- /* Only skip CBMEM, as RELOCATABLE_RAMSTAGE is a requirement, no need
- * to separately protect stack or heap */
+ /* Only skip CBMEM, stage program, stack and heap are included there. */
cbmem_get_region(&baseptr, &size);
memranges_insert(&mem, (uintptr_t)baseptr, size, BM_MEM_TABLE);