[PATCH v2 142/169] Correct SPL uses of SPI_FLASH_MACRONIX
Simon Glass
sjg at chromium.org
Mon Feb 6 01:55:09 CET 2023
This converts 2 usages of this option to the non-SPL form, since there is
no SPL_SPI_FLASH_MACRONIX defined in Kconfig
Signed-off-by: Simon Glass <sjg at chromium.org>
---
(no changes since v1)
drivers/mtd/spi/spi-nor-core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index d410ae58953..3f97acdb18c 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -3645,7 +3645,7 @@ static struct spi_nor_fixups mt35xu512aba_fixups = {
};
#endif /* CONFIG_SPI_FLASH_MT35XU */
-#if CONFIG_IS_ENABLED(SPI_FLASH_MACRONIX)
+#if IS_ENABLED(CONFIG_SPI_FLASH_MACRONIX)
/**
* spi_nor_macronix_octal_dtr_enable() - Enable octal DTR on Macronix flashes.
* @nor: pointer to a 'struct spi_nor'
@@ -3904,7 +3904,7 @@ void spi_nor_set_fixups(struct spi_nor *nor)
nor->fixups = &mt35xu512aba_fixups;
#endif
-#if CONFIG_IS_ENABLED(SPI_FLASH_MACRONIX)
+#if IS_ENABLED(CONFIG_SPI_FLASH_MACRONIX)
nor->fixups = ¯onix_octal_fixups;
#endif /* SPI_FLASH_MACRONIX */
}
--
2.39.1.519.gcb327c4b5f-goog
More information about the U-Boot
mailing list