From 18a8ba41cc748c4c85fb2d9b0314dbc87c2003c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Thu, 2 Jul 2020 21:48:38 +0300 Subject: arch/x86: Remove RELOCATABLE_RAMSTAGE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/43014 Reviewed-by: Aaron Durbin Reviewed-by: Nico Huber Tested-by: build bot (Jenkins) --- src/security/memory/Kconfig | 5 ++--- src/security/memory/memory_clear.c | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/security') 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); -- cgit v1.2.3