diff options
Diffstat (limited to 'src/lib/prog_loaders.c')
| -rw-r--r-- | src/lib/prog_loaders.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c index 7319811fcd..3b77712550 100644 --- a/src/lib/prog_loaders.c +++ b/src/lib/prog_loaders.c @@ -68,7 +68,7 @@ void run_romstage(void) prog_run(&romstage); fail: - if (IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE)) + if (CONFIG(BOOTBLOCK_CONSOLE)) die("Couldn't load romstage.\n"); halt(); } @@ -81,7 +81,7 @@ void __weak stage_cache_load_stage(int stage_id, static void ramstage_cache_invalid(void) { printk(BIOS_ERR, "ramstage cache invalid.\n"); - if (IS_ENABLED(CONFIG_RESET_ON_INVALID_RAMSTAGE_CACHE)) { + if (CONFIG(RESET_ON_INVALID_RAMSTAGE_CACHE)) { board_reset(); } } @@ -113,7 +113,7 @@ static int load_relocatable_ramstage(struct prog *ramstage) static int load_nonrelocatable_ramstage(struct prog *ramstage) { - if (IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)) { + if (CONFIG(HAVE_ACPI_RESUME)) { uintptr_t base = 0; size_t size = cbfs_prog_stage_section(ramstage, &base); if (size) @@ -139,8 +139,8 @@ void run_ramstage(void) * Only x86 systems using ramstage stage cache currently take the same * firmware path on resume. */ - if (IS_ENABLED(CONFIG_ARCH_X86) && - !IS_ENABLED(CONFIG_NO_STAGE_CACHE)) + if (CONFIG(ARCH_X86) && + !CONFIG(NO_STAGE_CACHE)) run_ramstage_from_resume(&ramstage); if (prog_locate(&ramstage)) @@ -148,13 +148,13 @@ void run_ramstage(void) timestamp_add_now(TS_START_COPYRAM); - if (IS_ENABLED(CONFIG_RELOCATABLE_RAMSTAGE)) { + if (CONFIG(RELOCATABLE_RAMSTAGE)) { if (load_relocatable_ramstage(&ramstage)) goto fail; } else if (load_nonrelocatable_ramstage(&ramstage)) goto fail; - if (!IS_ENABLED(CONFIG_NO_STAGE_CACHE)) + if (!CONFIG(NO_STAGE_CACHE)) stage_cache_add(STAGE_RAMSTAGE, &ramstage); timestamp_add_now(TS_END_COPYRAM); @@ -190,7 +190,7 @@ void payload_load(void) selfload_check(payload, BM_MEM_RAM); break; case CBFS_TYPE_FIT: /* Flattened image tree */ - if (IS_ENABLED(CONFIG_PAYLOAD_FIT_SUPPORT)) { + if (CONFIG(PAYLOAD_FIT_SUPPORT)) { fit_payload(payload); break; } /* else fall-through */ |