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/lib/prog_loaders.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/lib/prog_loaders.c') diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c index 69e81cda72..419f4cd834 100644 --- a/src/lib/prog_loaders.c +++ b/src/lib/prog_loaders.c @@ -129,10 +129,9 @@ void run_ramstage(void) timestamp_add_now(TS_START_COPYRAM); - if (CONFIG(RELOCATABLE_RAMSTAGE)) { - if (load_relocatable_ramstage(&ramstage)) - goto fail; - } else if (cbfs_prog_stage_load(&ramstage)) + if (ENV_X86 && load_relocatable_ramstage(&ramstage)) + goto fail; + else if (cbfs_prog_stage_load(&ramstage)) goto fail; stage_cache_add(STAGE_RAMSTAGE, &ramstage); -- cgit v1.2.3