From cd49cce7b70e80b4acc49b56bb2bb94370b4d867 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Tue, 5 Mar 2019 16:53:33 -0800 Subject: coreboot: Replace all IS_ENABLED(CONFIG_XXX) with CONFIG(XXX) This patch is a raw application of find src/ -type f | xargs sed -i -e 's/IS_ENABLED\s*(CONFIG_/CONFIG(/g' Change-Id: I6262d6d5c23cabe23c242b4f38d446b74fe16b88 Signed-off-by: Julius Werner Reviewed-on: https://review.coreboot.org/c/coreboot/+/31774 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/drivers/spi/adesto.c | 6 +++--- src/drivers/spi/amic.c | 6 +++--- src/drivers/spi/atmel.c | 6 +++--- src/drivers/spi/eon.c | 4 ++-- src/drivers/spi/gigadevice.c | 6 +++--- src/drivers/spi/macronix.c | 6 +++--- src/drivers/spi/spansion.c | 4 ++-- src/drivers/spi/spi_flash.c | 32 ++++++++++++++++---------------- src/drivers/spi/sst.c | 10 +++++----- src/drivers/spi/stmicro.c | 4 ++-- src/drivers/spi/winbond.c | 6 +++--- 11 files changed, 45 insertions(+), 45 deletions(-) (limited to 'src/drivers/spi') diff --git a/src/drivers/spi/adesto.c b/src/drivers/spi/adesto.c index 5195bec6b7..a805609c5e 100644 --- a/src/drivers/spi/adesto.c +++ b/src/drivers/spi/adesto.c @@ -162,7 +162,7 @@ static int adesto_write(const struct spi_flash *flash, u32 offset, size_t len, cmd[1] = (offset >> 16) & 0xff; cmd[2] = (offset >> 8) & 0xff; cmd[3] = offset & 0xff; -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "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); @@ -188,7 +188,7 @@ static int adesto_write(const struct spi_flash *flash, u32 offset, size_t len, offset += chunk_len; } -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: adesto: Successfully programmed %zu bytes @" " 0x%lx\n", len, (unsigned long)(offset - len)); #endif @@ -201,7 +201,7 @@ out: static const struct spi_flash_ops spi_flash_ops = { .write = adesto_write, .erase = spi_flash_cmd_erase, -#if IS_ENABLED(CONFIG_SPI_FLASH_NO_FAST_READ) +#if CONFIG(SPI_FLASH_NO_FAST_READ) .read = spi_flash_cmd_read_slow, #else .read = spi_flash_cmd_read_fast, diff --git a/src/drivers/spi/amic.c b/src/drivers/spi/amic.c index b0e926e898..64c91cc79f 100644 --- a/src/drivers/spi/amic.c +++ b/src/drivers/spi/amic.c @@ -136,7 +136,7 @@ static int amic_write(const struct spi_flash *flash, u32 offset, size_t len, cmd[1] = (offset >> 16) & 0xff; cmd[2] = (offset >> 8) & 0xff; cmd[3] = offset & 0xff; -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "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); @@ -163,7 +163,7 @@ static int amic_write(const struct spi_flash *flash, u32 offset, size_t len, byte_addr = 0; } -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: AMIC: Successfully programmed %zu bytes @" " 0x%lx\n", len, (unsigned long)(offset - len)); #endif @@ -176,7 +176,7 @@ out: static const struct spi_flash_ops spi_flash_ops = { .write = amic_write, .erase = spi_flash_cmd_erase, -#if IS_ENABLED(CONFIG_SPI_FLASH_NO_FAST_READ) +#if CONFIG(SPI_FLASH_NO_FAST_READ) .read = spi_flash_cmd_read_slow, #else .read = spi_flash_cmd_read_fast, diff --git a/src/drivers/spi/atmel.c b/src/drivers/spi/atmel.c index d81e0e3729..7d6e172755 100644 --- a/src/drivers/spi/atmel.c +++ b/src/drivers/spi/atmel.c @@ -118,7 +118,7 @@ static int atmel_write(const struct spi_flash *flash, u32 offset, size_t len, cmd[1] = (offset >> 16) & 0xff; cmd[2] = (offset >> 8) & 0xff; cmd[3] = offset & 0xff; -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "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); @@ -144,7 +144,7 @@ static int atmel_write(const struct spi_flash *flash, u32 offset, size_t len, offset += chunk_len; } -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: Atmel: Successfully programmed %zu bytes @" " 0x%lx\n", len, (unsigned long)(offset - len)); #endif @@ -157,7 +157,7 @@ out: static const struct spi_flash_ops spi_flash_ops = { .write = atmel_write, .erase = spi_flash_cmd_erase, -#if IS_ENABLED(CONFIG_SPI_FLASH_NO_FAST_READ) +#if CONFIG(SPI_FLASH_NO_FAST_READ) .read = spi_flash_cmd_read_slow, #else .read = spi_flash_cmd_read_fast, diff --git a/src/drivers/spi/eon.c b/src/drivers/spi/eon.c index fa155138fd..33e12a000f 100644 --- a/src/drivers/spi/eon.c +++ b/src/drivers/spi/eon.c @@ -257,7 +257,7 @@ static int eon_write(const struct spi_flash *flash, cmd[2] = (offset >> 8) & 0xff; cmd[3] = offset & 0xff; -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "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); @@ -279,7 +279,7 @@ static int eon_write(const struct spi_flash *flash, offset += chunk_len; } -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: EON: Successfully programmed %zu bytes @ %#x\n", len, (unsigned int)(offset - len)); #endif diff --git a/src/drivers/spi/gigadevice.c b/src/drivers/spi/gigadevice.c index ff1ce2f8e6..83216c06d1 100644 --- a/src/drivers/spi/gigadevice.c +++ b/src/drivers/spi/gigadevice.c @@ -184,7 +184,7 @@ static int gigadevice_write(const struct spi_flash *flash, u32 offset, cmd[1] = (offset >> 16) & 0xff; cmd[2] = (offset >> 8) & 0xff; cmd[3] = offset & 0xff; -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "PP gigadevice.c: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }" " chunk_len = %zu\n", buf + actual, @@ -206,7 +206,7 @@ static int gigadevice_write(const struct spi_flash *flash, u32 offset, offset += chunk_len; } -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF gigadevice.c: Successfully programmed %zu bytes @ %#x\n", len, (unsigned int)(offset - len)); @@ -222,7 +222,7 @@ static const struct spi_flash_ops spi_flash_ops = { .write = gigadevice_write, .erase = spi_flash_cmd_erase, .status = spi_flash_cmd_status, -#if IS_ENABLED(CONFIG_SPI_FLASH_NO_FAST_READ) +#if CONFIG(SPI_FLASH_NO_FAST_READ) .read = spi_flash_cmd_read_slow, #else .read = spi_flash_cmd_read_fast, diff --git a/src/drivers/spi/macronix.c b/src/drivers/spi/macronix.c index d9f0044380..1610ca18c8 100644 --- a/src/drivers/spi/macronix.c +++ b/src/drivers/spi/macronix.c @@ -230,7 +230,7 @@ static int macronix_write(const struct spi_flash *flash, u32 offset, size_t len, cmd[1] = (offset >> 16) & 0xff; cmd[2] = (offset >> 8) & 0xff; cmd[3] = offset & 0xff; -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "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); @@ -256,7 +256,7 @@ static int macronix_write(const struct spi_flash *flash, u32 offset, size_t len, offset += chunk_len; } -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: Macronix: Successfully programmed %zu bytes @" " 0x%lx\n", len, (unsigned long)(offset - len)); #endif @@ -268,7 +268,7 @@ static const struct spi_flash_ops spi_flash_ops = { .write = macronix_write, .erase = spi_flash_cmd_erase, .status = spi_flash_cmd_status, -#if IS_ENABLED(CONFIG_SPI_FLASH_NO_FAST_READ) +#if CONFIG(SPI_FLASH_NO_FAST_READ) .read = spi_flash_cmd_read_slow, #else .read = spi_flash_cmd_read_fast, diff --git a/src/drivers/spi/spansion.c b/src/drivers/spi/spansion.c index 2e924343e6..e687bf8471 100644 --- a/src/drivers/spi/spansion.c +++ b/src/drivers/spi/spansion.c @@ -245,7 +245,7 @@ static int spansion_write(const struct spi_flash *flash, u32 offset, size_t len, cmd[2] = (offset >> 8) & 0xff; cmd[3] = offset & 0xff; -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "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); @@ -271,7 +271,7 @@ static int spansion_write(const struct spi_flash *flash, u32 offset, size_t len, offset += chunk_len; } -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: SPANSION: Successfully programmed %zu bytes @ 0x%x\n", len, offset); #endif diff --git a/src/drivers/spi/spi_flash.c b/src/drivers/spi/spi_flash.c index d1f52271eb..71dc660d2b 100644 --- a/src/drivers/spi/spi_flash.c +++ b/src/drivers/spi/spi_flash.c @@ -217,7 +217,7 @@ int spi_flash_cmd_erase(const struct spi_flash *flash, u32 offset, size_t len) spi_flash_addr(offset, cmd); offset += erase_size; -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: erase %2x %2x %2x %2x (%x)\n", cmd[0], cmd[1], cmd[2], cmd[3], offset); #endif @@ -276,38 +276,38 @@ static struct { struct spi_flash *flash); } flashes[] = { /* Keep it sorted by define name */ -#if IS_ENABLED(CONFIG_SPI_FLASH_AMIC) +#if CONFIG(SPI_FLASH_AMIC) { 0, 0x37, spi_flash_probe_amic, }, #endif -#if IS_ENABLED(CONFIG_SPI_FLASH_ATMEL) +#if CONFIG(SPI_FLASH_ATMEL) { 0, 0x1f, spi_flash_probe_atmel, }, #endif -#if IS_ENABLED(CONFIG_SPI_FLASH_EON) +#if CONFIG(SPI_FLASH_EON) { 0, 0x1c, spi_flash_probe_eon, }, #endif -#if IS_ENABLED(CONFIG_SPI_FLASH_GIGADEVICE) +#if CONFIG(SPI_FLASH_GIGADEVICE) { 0, 0xc8, spi_flash_probe_gigadevice, }, #endif -#if IS_ENABLED(CONFIG_SPI_FLASH_MACRONIX) +#if CONFIG(SPI_FLASH_MACRONIX) { 0, 0xc2, spi_flash_probe_macronix, }, #endif -#if IS_ENABLED(CONFIG_SPI_FLASH_SPANSION) +#if CONFIG(SPI_FLASH_SPANSION) { 0, 0x01, spi_flash_probe_spansion, }, #endif -#if IS_ENABLED(CONFIG_SPI_FLASH_SST) +#if CONFIG(SPI_FLASH_SST) { 0, 0xbf, spi_flash_probe_sst, }, #endif -#if IS_ENABLED(CONFIG_SPI_FLASH_STMICRO) +#if CONFIG(SPI_FLASH_STMICRO) { 0, 0x20, spi_flash_probe_stmicro, }, #endif -#if IS_ENABLED(CONFIG_SPI_FLASH_WINBOND) +#if CONFIG(SPI_FLASH_WINBOND) { 0, 0xef, spi_flash_probe_winbond, }, #endif /* Keep it sorted by best detection */ -#if IS_ENABLED(CONFIG_SPI_FLASH_STMICRO) +#if CONFIG(SPI_FLASH_STMICRO) { 0, 0xff, spi_flash_probe_stmicro, }, #endif -#if IS_ENABLED(CONFIG_SPI_FLASH_ADESTO) +#if CONFIG(SPI_FLASH_ADESTO) { 0, 0x1f, spi_flash_probe_adesto, }, #endif }; @@ -324,7 +324,7 @@ int spi_flash_generic_probe(const struct spi_slave *spi, if (ret) return -1; - if (IS_ENABLED(CONFIG_DEBUG_SPI_FLASH)) { + if (CONFIG(DEBUG_SPI_FLASH)) { printk(BIOS_SPEW, "SF: Got idcode: "); for (i = 0; i < sizeof(idcode); i++) printk(BIOS_SPEW, "%02x ", idcode[i]); @@ -511,7 +511,7 @@ int spi_flash_volatile_group_begin(const struct spi_flash *flash) uint32_t count; int ret = 0; - if (!IS_ENABLED(CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP)) + if (!CONFIG(SPI_FLASH_HAS_VOLATILE_GROUP)) return ret; count = car_get_var(volatile_group_count); @@ -528,7 +528,7 @@ int spi_flash_volatile_group_end(const struct spi_flash *flash) uint32_t count; int ret = 0; - if (!IS_ENABLED(CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP)) + if (!CONFIG(SPI_FLASH_HAS_VOLATILE_GROUP)) return ret; count = car_get_var(volatile_group_count); @@ -547,7 +547,7 @@ void lb_spi_flash(struct lb_header *header) struct lb_spi_flash *flash; const struct spi_flash *spi_flash_dev; - if (!IS_ENABLED(CONFIG_BOOT_DEVICE_SPI_FLASH)) + if (!CONFIG(BOOT_DEVICE_SPI_FLASH)) return; flash = (struct lb_spi_flash *)lb_new_record(header); diff --git a/src/drivers/spi/sst.c b/src/drivers/spi/sst.c index 63fae95636..71bdac72a2 100644 --- a/src/drivers/spi/sst.c +++ b/src/drivers/spi/sst.c @@ -168,7 +168,7 @@ sst_byte_write(const struct spi_flash *flash, u32 offset, const void *buf) offset, }; -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "BP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n", spi_w8r8(&flash->spi, CMD_SST_RDSR), buf, cmd[0], offset); #endif @@ -223,7 +223,7 @@ static int sst_write_256(const struct spi_flash *flash, u32 offset, size_t len, cmd[1] = (offset >> 16) & 0xff; cmd[2] = (offset >> 8) & 0xff; cmd[3] = offset & 0xff; -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "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); @@ -250,7 +250,7 @@ static int sst_write_256(const struct spi_flash *flash, u32 offset, size_t len, } done: -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: SST: program %s %zu bytes @ 0x%lx\n", ret ? "failure" : "success", len, (unsigned long)offset - actual); #endif @@ -284,7 +284,7 @@ static int sst_write_ai(const struct spi_flash *flash, u32 offset, size_t len, cmd[3] = offset; for (; actual < len - 1; actual += 2) { -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "WP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n", spi_w8r8(&flash->spi, CMD_SST_RDSR), buf + actual, cmd[0], offset); @@ -313,7 +313,7 @@ static int sst_write_ai(const struct spi_flash *flash, u32 offset, size_t len, ret = sst_byte_write(flash, offset, buf + actual); done: -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: SST: program %s %zu bytes @ 0x%lx\n", ret ? "failure" : "success", len, (unsigned long)offset - actual); #endif diff --git a/src/drivers/spi/stmicro.c b/src/drivers/spi/stmicro.c index a89fc563e3..fb24b27266 100644 --- a/src/drivers/spi/stmicro.c +++ b/src/drivers/spi/stmicro.c @@ -312,7 +312,7 @@ static int stmicro_write(const struct spi_flash *flash, cmd[1] = (offset >> 16) & 0xff; cmd[2] = (offset >> 8) & 0xff; cmd[3] = offset & 0xff; -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "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); @@ -338,7 +338,7 @@ static int stmicro_write(const struct spi_flash *flash, offset += chunk_len; } -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: STMicro: Successfully programmed %zu bytes @" " 0x%lx\n", len, (unsigned long)(offset - len)); #endif diff --git a/src/drivers/spi/winbond.c b/src/drivers/spi/winbond.c index 8bf8fcd8d3..5a75ccc766 100644 --- a/src/drivers/spi/winbond.c +++ b/src/drivers/spi/winbond.c @@ -300,7 +300,7 @@ static int winbond_write(const struct spi_flash *flash, u32 offset, size_t len, cmd[1] = (offset >> 16) & 0xff; cmd[2] = (offset >> 8) & 0xff; cmd[3] = offset & 0xff; -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "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); @@ -326,7 +326,7 @@ static int winbond_write(const struct spi_flash *flash, u32 offset, size_t len, offset += chunk_len; } -#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) +#if CONFIG(DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: Winbond: Successfully programmed %zu bytes @" " 0x%lx\n", len, (unsigned long)(offset - len)); #endif @@ -657,7 +657,7 @@ static const struct spi_flash_ops spi_flash_ops = { .write = winbond_write, .erase = spi_flash_cmd_erase, .status = spi_flash_cmd_status, -#if IS_ENABLED(CONFIG_SPI_FLASH_NO_FAST_READ) +#if CONFIG(SPI_FLASH_NO_FAST_READ) .read = spi_flash_cmd_read_slow, #else .read = spi_flash_cmd_read_fast, -- cgit v1.2.3