<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/20339">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">drivers/spi: 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: If80e0c4e1c9911b44853561b03aef1c741255229<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/drivers/spi/adesto.c<br>M src/drivers/spi/amic.c<br>M src/drivers/spi/atmel.c<br>M src/drivers/spi/eon.c<br>M src/drivers/spi/gigadevice.c<br>M src/drivers/spi/macronix.c<br>M src/drivers/spi/spansion.c<br>M src/drivers/spi/spi_flash.c<br>M src/drivers/spi/sst.c<br>M src/drivers/spi/stmicro.c<br>M src/drivers/spi/winbond.c<br>11 files changed, 35 insertions(+), 35 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/39/20339/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/drivers/spi/adesto.c b/src/drivers/spi/adesto.c<br>index 3e857fc..3e3e7d4 100644<br>--- a/src/drivers/spi/adesto.c<br>+++ b/src/drivers/spi/adesto.c<br>@@ -90,7 +90,7 @@<br> cmd[1] = (offset >> 16) & 0xff;<br> cmd[2] = (offset >> 8) & 0xff;<br> cmd[3] = offset & 0xff;<br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"<br> " chunk_len = %zu\n", buf + actual,<br> cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);<br>@@ -116,7 +116,7 @@<br> offset += chunk_len;<br> }<br> <br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW, "SF: adesto: Successfully programmed %zu bytes @"<br> " 0x%lx\n", len, (unsigned long)(offset - len));<br> #endif<br>diff --git a/src/drivers/spi/amic.c b/src/drivers/spi/amic.c<br>index 239681c..64bdab3 100644<br>--- a/src/drivers/spi/amic.c<br>+++ b/src/drivers/spi/amic.c<br>@@ -72,7 +72,7 @@<br> cmd[1] = (offset >> 16) & 0xff;<br> cmd[2] = (offset >> 8) & 0xff;<br> cmd[3] = offset & 0xff;<br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"<br> " chunk_len = %zu\n", buf + actual,<br> cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);<br>@@ -99,7 +99,7 @@<br> byte_addr = 0;<br> }<br> <br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW, "SF: AMIC: Successfully programmed %zu bytes @"<br> " 0x%lx\n", len, (unsigned long)(offset - len));<br> #endif<br>diff --git a/src/drivers/spi/atmel.c b/src/drivers/spi/atmel.c<br>index 07bbf16..d81e0e3 100644<br>--- a/src/drivers/spi/atmel.c<br>+++ b/src/drivers/spi/atmel.c<br>@@ -118,7 +118,7 @@<br> cmd[1] = (offset >> 16) & 0xff;<br> cmd[2] = (offset >> 8) & 0xff;<br> cmd[3] = offset & 0xff;<br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"<br> " chunk_len = %zu\n", buf + actual,<br> cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);<br>@@ -144,7 +144,7 @@<br> offset += chunk_len;<br> }<br> <br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW, "SF: Atmel: Successfully programmed %zu bytes @"<br> " 0x%lx\n", len, (unsigned long)(offset - len));<br> #endif<br>diff --git a/src/drivers/spi/eon.c b/src/drivers/spi/eon.c<br>index a072e4e..49b56b4 100644<br>--- a/src/drivers/spi/eon.c<br>+++ b/src/drivers/spi/eon.c<br>@@ -95,7 +95,7 @@<br> cmd[2] = (offset >> 8) & 0xff;<br> cmd[3] = offset & 0xff;<br> <br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW,<br> "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %zu\n",<br> buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);<br>@@ -117,7 +117,7 @@<br> offset += chunk_len;<br> }<br> <br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW, "SF: EON: Successfully programmed %zu bytes @ %#x\n",<br> len, (unsigned int)(offset - len));<br> #endif<br>diff --git a/src/drivers/spi/gigadevice.c b/src/drivers/spi/gigadevice.c<br>index becc215..2d7544c 100644<br>--- a/src/drivers/spi/gigadevice.c<br>+++ b/src/drivers/spi/gigadevice.c<br>@@ -136,7 +136,7 @@<br> cmd[1] = (offset >> 16) & 0xff;<br> cmd[2] = (offset >> 8) & 0xff;<br> cmd[3] = offset & 0xff;<br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW,<br> "PP gigadevice.c: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"<br> " chunk_len = %zu\n", buf + actual,<br>@@ -158,7 +158,7 @@<br> offset += chunk_len;<br> }<br> <br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW,<br> "SF gigadevice.c: Successfully programmed %zu bytes @ %#x\n",<br> len, (unsigned int)(offset - len));<br>diff --git a/src/drivers/spi/macronix.c b/src/drivers/spi/macronix.c<br>index fd2d25b..b7f2c49 100644<br>--- a/src/drivers/spi/macronix.c<br>+++ b/src/drivers/spi/macronix.c<br>@@ -158,7 +158,7 @@<br> cmd[1] = (offset >> 16) & 0xff;<br> cmd[2] = (offset >> 8) & 0xff;<br> cmd[3] = offset & 0xff;<br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"<br> " chunk_len = %zu\n",<br> buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);<br>@@ -184,7 +184,7 @@<br> offset += chunk_len;<br> }<br> <br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW, "SF: Macronix: Successfully programmed %zu bytes @"<br> " 0x%lx\n", len, (unsigned long)(offset - len));<br> #endif<br>diff --git a/src/drivers/spi/spansion.c b/src/drivers/spi/spansion.c<br>index cb528d3..16c5180 100644<br>--- a/src/drivers/spi/spansion.c<br>+++ b/src/drivers/spi/spansion.c<br>@@ -212,7 +212,7 @@<br> cmd[2] = (offset >> 8) & 0xff;<br> cmd[3] = offset & 0xff;<br> <br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"<br> " chunk_len = %zu\n",<br> buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);<br>@@ -238,7 +238,7 @@<br> offset += chunk_len;<br> }<br> <br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW, "SF: SPANSION: Successfully programmed %zu bytes @ 0x%x\n",<br> len, offset);<br> #endif<br>diff --git a/src/drivers/spi/spi_flash.c b/src/drivers/spi/spi_flash.c<br>index c145379..74187a5 100644<br>--- a/src/drivers/spi/spi_flash.c<br>+++ b/src/drivers/spi/spi_flash.c<br>@@ -185,7 +185,7 @@<br> spi_flash_addr(offset, cmd);<br> offset += erase_size;<br> <br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW, "SF: erase %2x %2x %2x %2x (%x)\n", cmd[0], cmd[1],<br> cmd[2], cmd[3], offset);<br> #endif<br>@@ -244,38 +244,38 @@<br> struct spi_flash *flash);<br> } flashes[] = {<br> /* Keep it sorted by define name */<br>-#if CONFIG_SPI_FLASH_AMIC<br>+#if IS_ENABLED(CONFIG_SPI_FLASH_AMIC)<br> { 0, 0x37, spi_flash_probe_amic, },<br> #endif<br>-#if CONFIG_SPI_FLASH_ATMEL<br>+#if IS_ENABLED(CONFIG_SPI_FLASH_ATMEL)<br> { 0, 0x1f, spi_flash_probe_atmel, },<br> #endif<br>-#if CONFIG_SPI_FLASH_EON<br>+#if IS_ENABLED(CONFIG_SPI_FLASH_EON)<br> { 0, 0x1c, spi_flash_probe_eon, },<br> #endif<br>-#if CONFIG_SPI_FLASH_GIGADEVICE<br>+#if IS_ENABLED(CONFIG_SPI_FLASH_GIGADEVICE)<br> { 0, 0xc8, spi_flash_probe_gigadevice, },<br> #endif<br>-#if CONFIG_SPI_FLASH_MACRONIX<br>+#if IS_ENABLED(CONFIG_SPI_FLASH_MACRONIX)<br> { 0, 0xc2, spi_flash_probe_macronix, },<br> #endif<br>-#if CONFIG_SPI_FLASH_SPANSION<br>+#if IS_ENABLED(CONFIG_SPI_FLASH_SPANSION)<br> { 0, 0x01, spi_flash_probe_spansion, },<br> #endif<br>-#if CONFIG_SPI_FLASH_SST<br>+#if IS_ENABLED(CONFIG_SPI_FLASH_SST)<br> { 0, 0xbf, spi_flash_probe_sst, },<br> #endif<br>-#if CONFIG_SPI_FLASH_STMICRO<br>+#if IS_ENABLED(CONFIG_SPI_FLASH_STMICRO)<br> { 0, 0x20, spi_flash_probe_stmicro, },<br> #endif<br>-#if CONFIG_SPI_FLASH_WINBOND<br>+#if IS_ENABLED(CONFIG_SPI_FLASH_WINBOND)<br> { 0, 0xef, spi_flash_probe_winbond, },<br> #endif<br> /* Keep it sorted by best detection */<br>-#if CONFIG_SPI_FLASH_STMICRO<br>+#if IS_ENABLED(CONFIG_SPI_FLASH_STMICRO)<br> { 0, 0xff, spi_flash_probe_stmicro, },<br> #endif<br>-#if CONFIG_SPI_FLASH_ADESTO<br>+#if IS_ENABLED(CONFIG_SPI_FLASH_ADESTO)<br> { 0, 0x1f, spi_flash_probe_adesto, },<br> #endif<br> };<br>diff --git a/src/drivers/spi/sst.c b/src/drivers/spi/sst.c<br>index ce67e9b..559969a 100644<br>--- a/src/drivers/spi/sst.c<br>+++ b/src/drivers/spi/sst.c<br>@@ -153,7 +153,7 @@<br> offset,<br> };<br> <br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW, "BP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n",<br> spi_w8r8(&flash->spi, CMD_SST_RDSR), buf, cmd[0], offset);<br> #endif<br>@@ -208,7 +208,7 @@<br> cmd[1] = (offset >> 16) & 0xff;<br> cmd[2] = (offset >> 8) & 0xff;<br> cmd[3] = offset & 0xff;<br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"<br> " chunk_len = %zu\n",<br> buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);<br>@@ -235,7 +235,7 @@<br> }<br> <br> done:<br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW, "SF: SST: program %s %zu bytes @ 0x%lx\n",<br> ret ? "failure" : "success", len, (unsigned long)offset - actual);<br> #endif<br>@@ -269,7 +269,7 @@<br> cmd[3] = offset;<br> <br> for (; actual < len - 1; actual += 2) {<br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW, "WP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n",<br> spi_w8r8(&flash->spi, CMD_SST_RDSR), buf + actual, cmd[0],<br> offset);<br>@@ -298,7 +298,7 @@<br> ret = sst_byte_write(flash, offset, buf + actual);<br> <br> done:<br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW, "SF: SST: program %s %zu bytes @ 0x%lx\n",<br> ret ? "failure" : "success", len, (unsigned long)offset - actual);<br> #endif<br>diff --git a/src/drivers/spi/stmicro.c b/src/drivers/spi/stmicro.c<br>index 68eb37b..240d182 100644<br>--- a/src/drivers/spi/stmicro.c<br>+++ b/src/drivers/spi/stmicro.c<br>@@ -186,7 +186,7 @@<br> cmd[1] = (offset >> 16) & 0xff;<br> cmd[2] = (offset >> 8) & 0xff;<br> cmd[3] = offset & 0xff;<br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"<br> " chunk_len = %zu\n",<br> buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);<br>@@ -212,7 +212,7 @@<br> offset += chunk_len;<br> }<br> <br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW, "SF: STMicro: Successfully programmed %zu bytes @"<br> " 0x%lx\n", len, (unsigned long)(offset - len));<br> #endif<br>diff --git a/src/drivers/spi/winbond.c b/src/drivers/spi/winbond.c<br>index 77064ea..2fc8209 100644<br>--- a/src/drivers/spi/winbond.c<br>+++ b/src/drivers/spi/winbond.c<br>@@ -148,7 +148,7 @@<br> cmd[1] = (offset >> 16) & 0xff;<br> cmd[2] = (offset >> 8) & 0xff;<br> cmd[3] = offset & 0xff;<br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"<br> " chunk_len = %zu\n", buf + actual,<br> cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);<br>@@ -174,7 +174,7 @@<br> offset += chunk_len;<br> }<br> <br>-#if CONFIG_DEBUG_SPI_FLASH<br>+#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)<br> printk(BIOS_SPEW, "SF: Winbond: Successfully programmed %zu bytes @"<br> " 0x%lx\n", len, (unsigned long)(offset - len));<br> #endif<br></pre><p>To view, visit <a href="https://review.coreboot.org/20339">change 20339</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/20339"/><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: If80e0c4e1c9911b44853561b03aef1c741255229 </div>
<div style="display:none"> Gerrit-Change-Number: 20339 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>