diff options
author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-07-02 21:48:38 +0300 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2020-07-06 06:17:47 +0000 |
commit | 18a8ba41cc748c4c85fb2d9b0314dbc87c2003c1 (patch) | |
tree | f54881cde95e01ce3eedd9969bdcecd6008a8a7f /src/lib | |
parent | 7c040adc8c5aa00fabd315296aff4e70d5f03f7e (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/lib')
-rw-r--r-- | src/lib/prog_loaders.c | 7 |
1 files changed, 3 insertions, 4 deletions
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); |