<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/20341">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">src/lib: add IS_ENABLED() around Kconfig symbol references<br><br>Some of these can be changed from #if to if(), but that will happen<br>in a follow-on commmit.<br><br>Change-Id: Idcea3f8b1a4246cb6b29999a84a191a3133e5c78<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/lib/cbfs.c<br>M src/lib/coreboot_table.c<br>M src/lib/gcov-glue.c<br>M src/lib/generic_sdram.c<br>M src/lib/hardwaremain.c<br>M src/lib/malloc.c<br>M src/lib/ramtest.c<br>M src/lib/reg_script.c<br>8 files changed, 39 insertions(+), 39 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/41/20341/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c<br>index 11bce2c..596abc5 100644<br>--- a/src/lib/cbfs.c<br>+++ b/src/lib/cbfs.c<br>@@ -316,7 +316,7 @@<br> extern const struct cbfs_locator vboot_locator;<br> <br> static const struct cbfs_locator *locators[] = {<br>-#if CONFIG_VBOOT<br>+#if IS_ENABLED(CONFIG_VBOOT)<br> &vboot_locator,<br> #endif<br> &cbfs_master_header_locator,<br>diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c<br>index aa6c7a5..eb434cb 100644<br>--- a/src/lib/coreboot_table.c<br>+++ b/src/lib/coreboot_table.c<br>@@ -33,17 +33,17 @@<br> #include <bootmem.h><br> #include <spi_flash.h><br> #include <vboot/vbnv_layout.h><br>-#if CONFIG_USE_OPTION_TABLE<br>+#if IS_ENABLED(CONFIG_USE_OPTION_TABLE)<br> #include <option_table.h><br> #endif<br>-#if CONFIG_CHROMEOS<br>-#if CONFIG_HAVE_ACPI_TABLES<br>+#if IS_ENABLED(CONFIG_CHROMEOS)<br>+#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)<br> #include <arch/acpi.h><br> #endif<br> #include <vendorcode/google/chromeos/chromeos.h><br> #include <vendorcode/google/chromeos/gnvs.h><br> #endif<br>-#if CONFIG_ARCH_X86<br>+#if IS_ENABLED(CONFIG_ARCH_X86)<br> #include <cpu/x86/mtrr.h><br> #endif<br> #include <commonlib/helpers.h><br>@@ -159,7 +159,7 @@<br> gpios->size += table_size;<br> }<br> <br>-#if CONFIG_CHROMEOS<br>+#if IS_ENABLED(CONFIG_CHROMEOS)<br> static void lb_gpios(struct lb_header *header)<br> {<br> struct lb_gpios *gpios;<br>@@ -200,7 +200,7 @@<br> <br> static void lb_vdat(struct lb_header *header)<br> {<br>-#if CONFIG_HAVE_ACPI_TABLES<br>+#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)<br> struct lb_range *vdat;<br> <br> vdat = (struct lb_range *)lb_new_record(header);<br>@@ -212,7 +212,7 @@<br> <br> static void lb_vbnv(struct lb_header *header)<br> {<br>-#if CONFIG_PC80_SYSTEM<br>+#if IS_ENABLED(CONFIG_PC80_SYSTEM)<br> struct lb_range *vbnv;<br> <br> vbnv = (struct lb_range *)lb_new_record(header);<br>@@ -223,7 +223,7 @@<br> #endif<br> }<br> <br>-#if CONFIG_VBOOT<br>+#if IS_ENABLED(CONFIG_VBOOT)<br> static void lb_vboot_handoff(struct lb_header *header)<br> {<br> void *addr;<br>@@ -246,7 +246,7 @@<br> <br> static void lb_board_id(struct lb_header *header)<br> {<br>-#if CONFIG_BOARD_ID_AUTO || CONFIG_BOARD_ID_MANUAL<br>+#if IS_ENABLED(CONFIG_BOARD_ID_AUTO) || IS_ENABLED(CONFIG_BOARD_ID_MANUAL)<br> struct lb_board_id *bid;<br> <br> bid = (struct lb_board_id *)lb_new_record(header);<br>@@ -359,7 +359,7 @@<br> return mainboard;<br> }<br> <br>-#if CONFIG_USE_OPTION_TABLE<br>+#if IS_ENABLED(CONFIG_USE_OPTION_TABLE)<br> static struct cmos_checksum *lb_cmos_checksum(struct lb_header *header)<br> {<br> struct lb_record *rec;<br>@@ -475,7 +475,7 @@<br> <br> head = lb_table_init(rom_table_end);<br> <br>-#if CONFIG_USE_OPTION_TABLE<br>+#if IS_ENABLED(CONFIG_USE_OPTION_TABLE)<br> {<br> struct cmos_option_table *option_table =<br> cbfs_boot_map_with_leak("cmos_layout.bin",<br>@@ -506,10 +506,10 @@<br> lb_mainboard(head);<br> <br> /* Record the serial ports and consoles */<br>-#if CONFIG_CONSOLE_SERIAL<br>+#if IS_ENABLED(CONFIG_CONSOLE_SERIAL)<br> uart_fill_lb(head);<br> #endif<br>-#if CONFIG_CONSOLE_USB<br>+#if IS_ENABLED(CONFIG_CONSOLE_USB)<br> lb_add_console(LB_TAG_CONSOLE_EHCI, head);<br> #endif<br> <br>@@ -519,7 +519,7 @@<br> /* Record our framebuffer */<br> lb_framebuffer(head);<br> <br>-#if CONFIG_CHROMEOS<br>+#if IS_ENABLED(CONFIG_CHROMEOS)<br> /* Record our GPIO settings (ChromeOS specific) */<br> lb_gpios(head);<br> <br>diff --git a/src/lib/gcov-glue.c b/src/lib/gcov-glue.c<br>index a002ea7..7edc90a 100644<br>--- a/src/lib/gcov-glue.c<br>+++ b/src/lib/gcov-glue.c<br>@@ -41,7 +41,7 @@<br> <br> static FILE *fopen(const char *path, const char *mode)<br> {<br>-#if CONFIG_DEBUG_COVERAGE<br>+#if IS_ENABLED(CONFIG_DEBUG_COVERAGE)<br> printk(BIOS_DEBUG, "fopen %s with mode %s\n",<br> path, mode);<br> #endif<br>@@ -74,7 +74,7 @@<br> <br> static int fclose(FILE *stream)<br> {<br>-#if CONFIG_DEBUG_COVERAGE<br>+#if IS_ENABLED(CONFIG_DEBUG_COVERAGE)<br> printk(BIOS_DEBUG, "fclose %s\n", stream->filename);<br> #endif<br> return 0;<br>@@ -85,7 +85,7 @@<br> /* fseek should only be called with offset==0 and whence==SEEK_SET<br> * to a freshly opened file. */<br> gcc_assert(offset == 0 && whence == SEEK_SET);<br>-#if CONFIG_DEBUG_COVERAGE<br>+#if IS_ENABLED(CONFIG_DEBUG_COVERAGE)<br> printk(BIOS_DEBUG, "fseek %s offset=%ld whence=%d\n",<br> stream->filename, offset, whence);<br> #endif<br>@@ -96,7 +96,7 @@<br> {<br> /* ftell should currently not be called */<br> gcc_assert(0);<br>-#if CONFIG_DEBUG_COVERAGE<br>+#if IS_ENABLED(CONFIG_DEBUG_COVERAGE)<br> printk(BIOS_DEBUG, "ftell %s\n", stream->filename);<br> #endif<br> return 0;<br>@@ -104,7 +104,7 @@<br> <br> static size_t fread(void *ptr, size_t size, size_t nmemb, FILE *stream)<br> {<br>-#if CONFIG_DEBUG_COVERAGE<br>+#if IS_ENABLED(CONFIG_DEBUG_COVERAGE)<br> printk(BIOS_DEBUG, "fread: ptr=%p size=%zd nmemb=%zd FILE*=%p\n",<br> ptr, size, nmemb, stream);<br> #endif<br>@@ -113,7 +113,7 @@<br> <br> static size_t fwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream)<br> {<br>-#if CONFIG_DEBUG_COVERAGE<br>+#if IS_ENABLED(CONFIG_DEBUG_COVERAGE)<br> printk(BIOS_DEBUG, "fwrite: %zd * %zd bytes to file %s\n",<br> nmemb, size, stream->filename);<br> #endif<br>@@ -145,7 +145,7 @@<br> void __gcov_flush(void);<br> static void coverage_exit(void *unused)<br> {<br>-#if CONFIG_DEBUG_COVERAGE<br>+#if IS_ENABLED(CONFIG_DEBUG_COVERAGE)<br> printk(BIOS_DEBUG, "Syncing coverage data.\n");<br> #endif<br> __gcov_flush();<br>diff --git a/src/lib/generic_sdram.c b/src/lib/generic_sdram.c<br>index 801ae61..6aa8d29 100644<br>--- a/src/lib/generic_sdram.c<br>+++ b/src/lib/generic_sdram.c<br>@@ -1,7 +1,7 @@<br> #include <lib.h> /* Prototypes */<br> <br> /* Setup SDRAM */<br>-#if CONFIG_RAMINIT_SYSINFO<br>+#if IS_ENABLED(CONFIG_RAMINIT_SYSINFO)<br> void sdram_initialize(int controllers, const struct mem_controller *ctrl,<br> void *sysinfo)<br> #else<br>@@ -13,7 +13,7 @@<br> for (i = 0; i < controllers; i++) {<br> printk(BIOS_DEBUG, "Ram1.%02x\n", i);<br> <br>- #if CONFIG_RAMINIT_SYSINFO<br>+ #if IS_ENABLED(CONFIG_RAMINIT_SYSINFO)<br> sdram_set_registers(ctrl + i, sysinfo);<br> #else<br> sdram_set_registers(ctrl + i);<br>@@ -24,7 +24,7 @@<br> for (i = 0; i < controllers; i++) {<br> printk(BIOS_DEBUG, "Ram2.%02x\n", i);<br> <br>- #if CONFIG_RAMINIT_SYSINFO<br>+ #if IS_ENABLED(CONFIG_RAMINIT_SYSINFO)<br> sdram_set_spd_registers(ctrl + i, sysinfo);<br> #else<br> sdram_set_spd_registers(ctrl + i);<br>@@ -38,7 +38,7 @@<br> */<br> printk(BIOS_DEBUG, "Ram3\n");<br> <br>- #if CONFIG_RAMINIT_SYSINFO<br>+ #if IS_ENABLED(CONFIG_RAMINIT_SYSINFO)<br> sdram_enable(controllers, ctrl, sysinfo);<br> #else<br> sdram_enable(controllers, ctrl);<br>diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c<br>index a56d68e..0deab4b 100644<br>--- a/src/lib/hardwaremain.c<br>+++ b/src/lib/hardwaremain.c<br>@@ -33,7 +33,7 @@<br> #include <boot/tables.h><br> #include <program_loading.h><br> #include <lib.h><br>-#if CONFIG_HAVE_ACPI_RESUME<br>+#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)<br> #include <arch/acpi.h><br> #endif<br> #include <timer.h><br>@@ -82,7 +82,7 @@<br> boot_state_t (*run_state)(void *arg);<br> void *arg;<br> int complete : 1;<br>-#if CONFIG_HAVE_MONOTONIC_TIMER<br>+#if IS_ENABLED(CONFIG_HAVE_MONOTONIC_TIMER)<br> struct boot_state_times times;<br> #endif<br> };<br>@@ -180,7 +180,7 @@<br> <br> static boot_state_t bs_os_resume_check(void *arg)<br> {<br>-#if CONFIG_HAVE_ACPI_RESUME<br>+#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)<br> void *wake_vector;<br> <br> wake_vector = acpi_find_wakeup_vector();<br>@@ -199,7 +199,7 @@<br> <br> static boot_state_t bs_os_resume(void *wake_vector)<br> {<br>-#if CONFIG_HAVE_ACPI_RESUME<br>+#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)<br> arch_bootstate_coreboot_exit();<br> acpi_resume(wake_vector);<br> #endif<br>@@ -239,7 +239,7 @@<br> return BS_PAYLOAD_BOOT;<br> }<br> <br>-#if CONFIG_HAVE_MONOTONIC_TIMER<br>+#if IS_ENABLED(CONFIG_HAVE_MONOTONIC_TIMER)<br> static void bs_sample_time(struct boot_state *state)<br> {<br> struct mono_time *mt;<br>@@ -268,7 +268,7 @@<br> static inline void bs_report_time(struct boot_state *state) {}<br> #endif<br> <br>-#if CONFIG_TIMER_QUEUE<br>+#if IS_ENABLED(CONFIG_TIMER_QUEUE)<br> static void bs_run_timers(int drain)<br> {<br> /* Drain all timer callbacks until none are left, if directed.<br>@@ -473,7 +473,7 @@<br> post_code(POST_ENTRY_RAMSTAGE);<br> <br> /* Handoff sleep type from romstage. */<br>-#if CONFIG_HAVE_ACPI_RESUME<br>+#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)<br> acpi_is_wakeup();<br> #endif<br> <br>diff --git a/src/lib/malloc.c b/src/lib/malloc.c<br>index 9974b2c..b881ed2 100644<br>--- a/src/lib/malloc.c<br>+++ b/src/lib/malloc.c<br>@@ -2,7 +2,7 @@<br> #include <console/console.h><br> #include <cpu/x86/smm.h><br> <br>-#if CONFIG_DEBUG_MALLOC<br>+#if IS_ENABLED(CONFIG_DEBUG_MALLOC)<br> #define MALLOCDBG(x...) printk(BIOS_SPEW, x)<br> #else<br> #define MALLOCDBG(x...)<br>diff --git a/src/lib/ramtest.c b/src/lib/ramtest.c<br>index 419d0eb..2b2c344 100644<br>--- a/src/lib/ramtest.c<br>+++ b/src/lib/ramtest.c<br>@@ -6,7 +6,7 @@<br> {<br> // Assembler in lib/ is very ugly. But we properly guarded<br> // it so let's obey this one for now<br>-#if CONFIG_SSE2<br>+#if IS_ENABLED(CONFIG_SSE2)<br> asm volatile(<br> "movnti %1, (%0)"<br> : /* outputs */<br>@@ -31,7 +31,7 @@<br> <br> static void phys_memory_barrier(void)<br> {<br>-#if CONFIG_SSE2<br>+#if IS_ENABLED(CONFIG_SSE2)<br> // Needed for movnti<br> asm volatile (<br> "sfence"<br>diff --git a/src/lib/reg_script.c b/src/lib/reg_script.c<br>index 8d813b6..56285f1 100644<br>--- a/src/lib/reg_script.c<br>+++ b/src/lib/reg_script.c<br>@@ -22,7 +22,7 @@<br> #include <stdint.h><br> #include <reg_script.h><br> <br>-#if CONFIG_ARCH_X86<br>+#if IS_ENABLED(CONFIG_ARCH_X86)<br> #include <cpu/x86/msr.h><br> #endif<br> <br>@@ -369,7 +369,7 @@<br> <br> static uint64_t reg_script_read_msr(struct reg_script_context *ctx)<br> {<br>-#if CONFIG_ARCH_X86<br>+#if IS_ENABLED(CONFIG_ARCH_X86)<br> const struct reg_script *step = reg_script_get_step(ctx);<br> msr_t msr = rdmsr(step->reg);<br> uint64_t value = msr.hi;<br>@@ -382,7 +382,7 @@<br> <br> static void reg_script_write_msr(struct reg_script_context *ctx)<br> {<br>-#if CONFIG_ARCH_X86<br>+#if IS_ENABLED(CONFIG_ARCH_X86)<br> const struct reg_script *step = reg_script_get_step(ctx);<br> msr_t msr;<br> msr.hi = step->value >> 32;<br></pre><p>To view, visit <a href="https://review.coreboot.org/20341">change 20341</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/20341"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Idcea3f8b1a4246cb6b29999a84a191a3133e5c78 </div>
<div style="display:none"> Gerrit-Change-Number: 20341 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>