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

drivers/spi: add IS_ENABLED() around Kconfig symbol references

Browse Source 
Some of these can be changed from #if to if(), but that will happen
in a follow-on commmit.

Change-Id: If80e0c4e1c9911b44853561b03aef1c741255229
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/20339
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Martin Roth
2017-06-24 14:02:00 -06:00
parent 0d9b360b42
commit e7d0a37501
11 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/spi/adesto.c
View File

@ -90,7 +90,7 @@ static int adesto_write(const struct spi_flash *flash, u32 offset, size_t len,
cmd[1] = (offset >> 16) & 0xff; cmd[1] = (offset >> 16) & 0xff;
cmd[2] = (offset >> 8) & 0xff; cmd[2] = (offset >> 8) & 0xff;
cmd[3] = offset & 0xff; cmd[3] = offset & 0xff;
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }" printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"
" chunk_len = %zu\n", buf + actual, " chunk_len = %zu\n", buf + actual,
cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
@ -116,7 +116,7 @@ static int adesto_write(const struct spi_flash *flash, u32 offset, size_t len,
offset += chunk_len; offset += chunk_len;
} }
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, "SF: adesto: Successfully programmed %zu bytes @" printk(BIOS_SPEW, "SF: adesto: Successfully programmed %zu bytes @"
" 0x%lx\n", len, (unsigned long)(offset - len)); " 0x%lx\n", len, (unsigned long)(offset - len));
#endif #endif

4
src/drivers/spi/amic.c
View File

@ -72,7 +72,7 @@ static int amic_write(const struct spi_flash *flash, u32 offset, size_t len,
cmd[1] = (offset >> 16) & 0xff; cmd[1] = (offset >> 16) & 0xff;
cmd[2] = (offset >> 8) & 0xff; cmd[2] = (offset >> 8) & 0xff;
cmd[3] = offset & 0xff; cmd[3] = offset & 0xff;
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }" printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"
" chunk_len = %zu\n", buf + actual, " chunk_len = %zu\n", buf + actual,
cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
@ -99,7 +99,7 @@ static int amic_write(const struct spi_flash *flash, u32 offset, size_t len,
byte_addr = 0; byte_addr = 0;
} }
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, "SF: AMIC: Successfully programmed %zu bytes @" printk(BIOS_SPEW, "SF: AMIC: Successfully programmed %zu bytes @"
" 0x%lx\n", len, (unsigned long)(offset - len)); " 0x%lx\n", len, (unsigned long)(offset - len));
#endif #endif

4
src/drivers/spi/atmel.c
View File

@ -118,7 +118,7 @@ static int atmel_write(const struct spi_flash *flash, u32 offset, size_t len,
cmd[1] = (offset >> 16) & 0xff; cmd[1] = (offset >> 16) & 0xff;
cmd[2] = (offset >> 8) & 0xff; cmd[2] = (offset >> 8) & 0xff;
cmd[3] = offset & 0xff; cmd[3] = offset & 0xff;
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }" printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"
" chunk_len = %zu\n", buf + actual, " chunk_len = %zu\n", buf + actual,
cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
@ -144,7 +144,7 @@ static int atmel_write(const struct spi_flash *flash, u32 offset, size_t len,
offset += chunk_len; offset += chunk_len;
} }
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, "SF: Atmel: Successfully programmed %zu bytes @" printk(BIOS_SPEW, "SF: Atmel: Successfully programmed %zu bytes @"
" 0x%lx\n", len, (unsigned long)(offset - len)); " 0x%lx\n", len, (unsigned long)(offset - len));
#endif #endif

4
src/drivers/spi/eon.c
View File

@ -95,7 +95,7 @@ static int eon_write(const struct spi_flash *flash,
cmd[2] = (offset >> 8) & 0xff; cmd[2] = (offset >> 8) & 0xff;
cmd[3] = offset & 0xff; cmd[3] = offset & 0xff;
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, printk(BIOS_SPEW,
"PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %zu\n", "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %zu\n",
buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
@ -117,7 +117,7 @@ static int eon_write(const struct spi_flash *flash,
offset += chunk_len; offset += chunk_len;
} }
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, "SF: EON: Successfully programmed %zu bytes @ %#x\n", printk(BIOS_SPEW, "SF: EON: Successfully programmed %zu bytes @ %#x\n",
len, (unsigned int)(offset - len)); len, (unsigned int)(offset - len));
#endif #endif

4
src/drivers/spi/gigadevice.c
View File

@ -136,7 +136,7 @@ static int gigadevice_write(const struct spi_flash *flash, u32 offset,
cmd[1] = (offset >> 16) & 0xff; cmd[1] = (offset >> 16) & 0xff;
cmd[2] = (offset >> 8) & 0xff; cmd[2] = (offset >> 8) & 0xff;
cmd[3] = offset & 0xff; cmd[3] = offset & 0xff;
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, printk(BIOS_SPEW,
"PP gigadevice.c: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }" "PP gigadevice.c: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"
" chunk_len = %zu\n", buf + actual, " chunk_len = %zu\n", buf + actual,
@ -158,7 +158,7 @@ static int gigadevice_write(const struct spi_flash *flash, u32 offset,
offset += chunk_len; offset += chunk_len;
} }
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, printk(BIOS_SPEW,
"SF gigadevice.c: Successfully programmed %zu bytes @ %#x\n", "SF gigadevice.c: Successfully programmed %zu bytes @ %#x\n",
len, (unsigned int)(offset - len)); len, (unsigned int)(offset - len));

4
src/drivers/spi/macronix.c
View File

@ -158,7 +158,7 @@ static int macronix_write(const struct spi_flash *flash, u32 offset, size_t len,
cmd[1] = (offset >> 16) & 0xff; cmd[1] = (offset >> 16) & 0xff;
cmd[2] = (offset >> 8) & 0xff; cmd[2] = (offset >> 8) & 0xff;
cmd[3] = offset & 0xff; cmd[3] = offset & 0xff;
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }" printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"
" chunk_len = %zu\n", " chunk_len = %zu\n",
buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
@ -184,7 +184,7 @@ static int macronix_write(const struct spi_flash *flash, u32 offset, size_t len,
offset += chunk_len; offset += chunk_len;
} }
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, "SF: Macronix: Successfully programmed %zu bytes @" printk(BIOS_SPEW, "SF: Macronix: Successfully programmed %zu bytes @"
" 0x%lx\n", len, (unsigned long)(offset - len)); " 0x%lx\n", len, (unsigned long)(offset - len));
#endif #endif

4
src/drivers/spi/spansion.c
View File

@ -212,7 +212,7 @@ static int spansion_write(const struct spi_flash *flash, u32 offset, size_t len,
cmd[2] = (offset >> 8) & 0xff; cmd[2] = (offset >> 8) & 0xff;
cmd[3] = offset & 0xff; cmd[3] = offset & 0xff;
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }" printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"
" chunk_len = %zu\n", " chunk_len = %zu\n",
buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
@ -238,7 +238,7 @@ static int spansion_write(const struct spi_flash *flash, u32 offset, size_t len,
offset += chunk_len; offset += chunk_len;
} }
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, "SF: SPANSION: Successfully programmed %zu bytes @ 0x%x\n", printk(BIOS_SPEW, "SF: SPANSION: Successfully programmed %zu bytes @ 0x%x\n",
len, offset); len, offset);
#endif #endif

24
src/drivers/spi/spi_flash.c
View File

@ -187,7 +187,7 @@ int spi_flash_cmd_erase(const struct spi_flash *flash, u32 offset, size_t len)
spi_flash_addr(offset, cmd); spi_flash_addr(offset, cmd);
offset += erase_size; offset += erase_size;
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, "SF: erase %2x %2x %2x %2x (%x)\n", cmd[0], cmd[1], printk(BIOS_SPEW, "SF: erase %2x %2x %2x %2x (%x)\n", cmd[0], cmd[1],
cmd[2], cmd[3], offset); cmd[2], cmd[3], offset);
#endif #endif
@ -246,38 +246,38 @@ static struct {
struct spi_flash *flash); struct spi_flash *flash);
} flashes[] = { } flashes[] = {
/* Keep it sorted by define name */ /* Keep it sorted by define name */
#if CONFIG_SPI_FLASH_AMIC #if IS_ENABLED(CONFIG_SPI_FLASH_AMIC)
{ 0, 0x37, spi_flash_probe_amic, }, { 0, 0x37, spi_flash_probe_amic, },
#endif #endif
#if CONFIG_SPI_FLASH_ATMEL #if IS_ENABLED(CONFIG_SPI_FLASH_ATMEL)
{ 0, 0x1f, spi_flash_probe_atmel, }, { 0, 0x1f, spi_flash_probe_atmel, },
#endif #endif
#if CONFIG_SPI_FLASH_EON #if IS_ENABLED(CONFIG_SPI_FLASH_EON)
{ 0, 0x1c, spi_flash_probe_eon, }, { 0, 0x1c, spi_flash_probe_eon, },
#endif #endif
#if CONFIG_SPI_FLASH_GIGADEVICE #if IS_ENABLED(CONFIG_SPI_FLASH_GIGADEVICE)
{ 0, 0xc8, spi_flash_probe_gigadevice, }, { 0, 0xc8, spi_flash_probe_gigadevice, },
#endif #endif
#if CONFIG_SPI_FLASH_MACRONIX #if IS_ENABLED(CONFIG_SPI_FLASH_MACRONIX)
{ 0, 0xc2, spi_flash_probe_macronix, }, { 0, 0xc2, spi_flash_probe_macronix, },
#endif #endif
#if CONFIG_SPI_FLASH_SPANSION #if IS_ENABLED(CONFIG_SPI_FLASH_SPANSION)
{ 0, 0x01, spi_flash_probe_spansion, }, { 0, 0x01, spi_flash_probe_spansion, },
#endif #endif
#if CONFIG_SPI_FLASH_SST #if IS_ENABLED(CONFIG_SPI_FLASH_SST)
{ 0, 0xbf, spi_flash_probe_sst, }, { 0, 0xbf, spi_flash_probe_sst, },
#endif #endif
#if CONFIG_SPI_FLASH_STMICRO #if IS_ENABLED(CONFIG_SPI_FLASH_STMICRO)
{ 0, 0x20, spi_flash_probe_stmicro, }, { 0, 0x20, spi_flash_probe_stmicro, },
#endif #endif
#if CONFIG_SPI_FLASH_WINBOND #if IS_ENABLED(CONFIG_SPI_FLASH_WINBOND)
{ 0, 0xef, spi_flash_probe_winbond, }, { 0, 0xef, spi_flash_probe_winbond, },
#endif #endif
/* Keep it sorted by best detection */ /* Keep it sorted by best detection */
#if CONFIG_SPI_FLASH_STMICRO #if IS_ENABLED(CONFIG_SPI_FLASH_STMICRO)
{ 0, 0xff, spi_flash_probe_stmicro, }, { 0, 0xff, spi_flash_probe_stmicro, },
#endif #endif
#if CONFIG_SPI_FLASH_ADESTO #if IS_ENABLED(CONFIG_SPI_FLASH_ADESTO)
{ 0, 0x1f, spi_flash_probe_adesto, }, { 0, 0x1f, spi_flash_probe_adesto, },
#endif #endif
}; };

10
src/drivers/spi/sst.c
View File

@ -153,7 +153,7 @@ sst_byte_write(const struct spi_flash *flash, u32 offset, const void *buf)
offset, offset,
}; };
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, "BP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n", printk(BIOS_SPEW, "BP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n",
spi_w8r8(&flash->spi, CMD_SST_RDSR), buf, cmd[0], offset); spi_w8r8(&flash->spi, CMD_SST_RDSR), buf, cmd[0], offset);
#endif #endif
@ -208,7 +208,7 @@ static int sst_write_256(const struct spi_flash *flash, u32 offset, size_t len,
cmd[1] = (offset >> 16) & 0xff; cmd[1] = (offset >> 16) & 0xff;
cmd[2] = (offset >> 8) & 0xff; cmd[2] = (offset >> 8) & 0xff;
cmd[3] = offset & 0xff; cmd[3] = offset & 0xff;
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }" printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"
" chunk_len = %zu\n", " chunk_len = %zu\n",
buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
@ -235,7 +235,7 @@ static int sst_write_256(const struct spi_flash *flash, u32 offset, size_t len,
} }
done: done:
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, "SF: SST: program %s %zu bytes @ 0x%lx\n", printk(BIOS_SPEW, "SF: SST: program %s %zu bytes @ 0x%lx\n",
ret ? "failure" : "success", len, (unsigned long)offset - actual); ret ? "failure" : "success", len, (unsigned long)offset - actual);
#endif #endif
@ -269,7 +269,7 @@ static int sst_write_ai(const struct spi_flash *flash, u32 offset, size_t len,
cmd[3] = offset; cmd[3] = offset;
for (; actual < len - 1; actual += 2) { for (; actual < len - 1; actual += 2) {
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, "WP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n", printk(BIOS_SPEW, "WP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n",
spi_w8r8(&flash->spi, CMD_SST_RDSR), buf + actual, cmd[0], spi_w8r8(&flash->spi, CMD_SST_RDSR), buf + actual, cmd[0],
offset); offset);
@ -298,7 +298,7 @@ static int sst_write_ai(const struct spi_flash *flash, u32 offset, size_t len,
ret = sst_byte_write(flash, offset, buf + actual); ret = sst_byte_write(flash, offset, buf + actual);
done: done:
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, "SF: SST: program %s %zu bytes @ 0x%lx\n", printk(BIOS_SPEW, "SF: SST: program %s %zu bytes @ 0x%lx\n",
ret ? "failure" : "success", len, (unsigned long)offset - actual); ret ? "failure" : "success", len, (unsigned long)offset - actual);
#endif #endif

4
src/drivers/spi/stmicro.c
View File

@ -186,7 +186,7 @@ static int stmicro_write(const struct spi_flash *flash,
cmd[1] = (offset >> 16) & 0xff; cmd[1] = (offset >> 16) & 0xff;
cmd[2] = (offset >> 8) & 0xff; cmd[2] = (offset >> 8) & 0xff;
cmd[3] = offset & 0xff; cmd[3] = offset & 0xff;
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }" printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"
" chunk_len = %zu\n", " chunk_len = %zu\n",
buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
@ -212,7 +212,7 @@ static int stmicro_write(const struct spi_flash *flash,
offset += chunk_len; offset += chunk_len;
} }
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, "SF: STMicro: Successfully programmed %zu bytes @" printk(BIOS_SPEW, "SF: STMicro: Successfully programmed %zu bytes @"
" 0x%lx\n", len, (unsigned long)(offset - len)); " 0x%lx\n", len, (unsigned long)(offset - len));
#endif #endif

4
src/drivers/spi/winbond.c
View File

@ -148,7 +148,7 @@ static int winbond_write(const struct spi_flash *flash, u32 offset, size_t len,
cmd[1] = (offset >> 16) & 0xff; cmd[1] = (offset >> 16) & 0xff;
cmd[2] = (offset >> 8) & 0xff; cmd[2] = (offset >> 8) & 0xff;
cmd[3] = offset & 0xff; cmd[3] = offset & 0xff;
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }" printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"
" chunk_len = %zu\n", buf + actual, " chunk_len = %zu\n", buf + actual,
cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
@ -174,7 +174,7 @@ static int winbond_write(const struct spi_flash *flash, u32 offset, size_t len,
offset += chunk_len; offset += chunk_len;
} }
#if CONFIG_DEBUG_SPI_FLASH #if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)
printk(BIOS_SPEW, "SF: Winbond: Successfully programmed %zu bytes @" printk(BIOS_SPEW, "SF: Winbond: Successfully programmed %zu bytes @"
" 0x%lx\n", len, (unsigned long)(offset - len)); " 0x%lx\n", len, (unsigned long)(offset - len));
#endif #endif