From 7336f97debc883d293e4d5f942c556d1f8931842 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Mon, 8 Jun 2020 06:05:03 +0300 Subject: treewide: Replace CONFIG(ARCH_xx) tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/42183 Reviewed-by: Raul Rangel Reviewed-by: Furquan Shaikh Reviewed-by: Angel Pons Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/lib/prog_loaders.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/lib/prog_loaders.c') diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c index 7088d8d45e..69e81cda72 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(); -- cgit v1.2.3