diff mbox series

[v2,142/169] Correct SPL uses of SPI_FLASH_MACRONIX

Message ID 20230206005537.254541-143-sjg@chromium.org
State Changes Requested
Delegated to: Tom Rini
Headers show
Series None | expand

Commit Message

Simon Glass Feb. 6, 2023, 12:55 a.m. UTC 
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@chromium.org>
---

(no changes since v1)

 drivers/mtd/spi/spi-nor-core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Tom Rini Feb. 9, 2023, 5:05 p.m. UTC | #1 
On Sun, Feb 05, 2023 at 05:55:09PM -0700, Simon Glass wrote:

> 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@chromium.org>
> ---
> 
> (no changes since v1)
> 
>  drivers/mtd/spi/spi-nor-core.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

This increases size on at least xilinx_zynqmp_virt.
Simon Glass Feb. 12, 2023, 11:15 p.m. UTC | #2 
Hi Tom,

On Thu, 9 Feb 2023 at 10:06, Tom Rini <trini@konsulko.com> wrote:
>
> On Sun, Feb 05, 2023 at 05:55:09PM -0700, Simon Glass wrote:
>
> > 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@chromium.org>
> > ---
> >
> > (no changes since v1)
> >
> >  drivers/mtd/spi/spi-nor-core.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
>
> This increases size on at least xilinx_zynqmp_virt.

I'll add this to config_nospl

Regards,
Simon
diff mbox series

Patch

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 = &macronix_octal_fixups;
 #endif /* SPI_FLASH_MACRONIX */
 }