sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: Replace CONFIG(ARCH_xx) tests

Browse Source 
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>
This commit is contained in:
Kyösti Mälkki
2020-06-08 06:05:03 +03:00
committed by Angel Pons
parent 5edbb1c5d9
commit 7336f97deb
16 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/prog_loaders.c
View File

@ -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();