diff options
| author | Simon Glass <sjg@chromium.org> | 2020-11-04 09:57:24 -0700 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2020-11-05 14:58:45 +0800 |
| commit | f36e4c7d8059a3bb03bb172bf87ebefd7a95bd56 (patch) | |
| tree | a8dac4afdf525294bae7e83a6a0cbbb529b8c66f | |
| parent | cac9c6a38f7828ae049c9c38af4a6d1d6d8e12d7 (diff) | |
x86: Use if instead of #ifdef in write_tables()
Use if() to remove the extra build path in this code.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| -rw-r--r-- | arch/x86/lib/tables.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c index 7099866a78..f7b71c5cd1 100644 --- a/arch/x86/lib/tables.c +++ b/arch/x86/lib/tables.c @@ -68,10 +68,8 @@ int write_tables(void) { u32 rom_table_start = ROM_TABLE_ADDR; u32 rom_table_end; -#ifdef CONFIG_SEABIOS u32 high_table, table_size; struct memory_area cfg_tables[ARRAY_SIZE(table_list) + 1]; -#endif int i; debug("Writing tables to %x:\n", rom_table_start); @@ -81,30 +79,32 @@ int write_tables(void) rom_table_end = table->write(rom_table_start); rom_table_end = ALIGN(rom_table_end, ROM_TABLE_ALIGN); -#ifdef CONFIG_SEABIOS - table_size = rom_table_end - rom_table_start; - high_table = (u32)high_table_malloc(table_size); - if (high_table) { - table->write(high_table); - - cfg_tables[i].start = high_table; - cfg_tables[i].size = table_size; - } else { - printf("%d: no memory for configuration tables\n", i); - return -ENOSPC; + if (IS_ENABLED(CONFIG_SEABIOS)) { + table_size = rom_table_end - rom_table_start; + high_table = (u32)(ulong)high_table_malloc(table_size); + if (high_table) { + table->write(high_table); + + cfg_tables[i].start = high_table; + cfg_tables[i].size = table_size; + } else { + printf("%d: no memory for configuration tables\n", + i); + return -ENOSPC; + } } -#endif debug("- wrote '%s' to %x, end %x\n", table->name, rom_table_start, rom_table_end); rom_table_start = rom_table_end; } -#ifdef CONFIG_SEABIOS - /* make sure the last item is zero */ - cfg_tables[i].size = 0; - write_coreboot_table(CB_TABLE_ADDR, cfg_tables); -#endif + if (IS_ENABLED(CONFIG_SEABIOS)) { + /* make sure the last item is zero */ + cfg_tables[i].size = 0; + write_coreboot_table(CB_TABLE_ADDR, cfg_tables); + } + debug("- done writing tables\n"); return 0; |