diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-06-08 06:05:03 +0300 |
|---|---|---|
| committer | Angel Pons <th3fanbus@gmail.com> | 2020-06-17 21:13:09 +0000 |
| commit | 7336f97debc883d293e4d5f942c556d1f8931842 (patch) | |
| tree | ccce5515be8a082f964a5c309d89468776a1bc96 /src/lib/prog_loaders.c | |
| parent | 5edbb1c5d917ae27aa8c869a92f3f8750dea9845 (diff) | |
| download | coreboot-7336f97debc883d293e4d5f942c556d1f8931842.tar.gz coreboot-7336f97debc883d293e4d5f942c556d1f8931842.tar.bz2 coreboot-7336f97debc883d293e4d5f942c556d1f8931842.zip | |
treewide: Replace CONFIG(ARCH_xx) tests
Once we support building stages for different architectures,
such CONFIG(ARCH_xx) tests do not evaluate correctly anymore.
Change-Id: I599995b3ed5c4dfd578c87067fe8bfc8c75b9d43
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42183
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/lib/prog_loaders.c')
| -rw-r--r-- | src/lib/prog_loaders.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c index 7088d8d45ee5..69e81cda728e 100644 --- a/src/lib/prog_loaders.c +++ b/src/lib/prog_loaders.c @@ -46,7 +46,7 @@ void run_romstage(void) vboot_run_logic(); - if (CONFIG(ARCH_X86) && CONFIG(BOOTBLOCK_NORMAL)) { + if (ENV_X86 && CONFIG(BOOTBLOCK_NORMAL)) { if (legacy_romstage_selector(&romstage)) goto fail; } else { @@ -119,8 +119,7 @@ void run_ramstage(void) * Only x86 systems using ramstage stage cache currently take the same * firmware path on resume. */ - if (CONFIG(ARCH_X86) && - !CONFIG(NO_STAGE_CACHE)) + if (ENV_X86 && !CONFIG(NO_STAGE_CACHE)) run_ramstage_from_resume(&ramstage); vboot_run_logic(); |