diff mbox series

[v2,141/169] Correct SPL use of SPI_FLASH_BAR

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

Commit Message

Simon Glass Feb. 6, 2023, 12:55 a.m. UTC
This converts 1 usage of this option to the non-SPL form, since there is
no SPL_SPI_FLASH_BAR defined in Kconfig

Signed-off-by: Simon Glass <sjg@chromium.org>
---

(no changes since v1)

 drivers/mtd/spi/spi-nor-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

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

> This converts 1 usage of this option to the non-SPL form, since there is
> no SPL_SPI_FLASH_BAR defined in Kconfig
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>

This is used to avoid unused code on at least xilinx_zynqmp_virt.
Simon Glass Feb. 12, 2023, 11:14 p.m. UTC | #2
Hi Tom,

On Wed, 8 Feb 2023 at 18:30, Tom Rini <trini@konsulko.com> wrote:
>
> On Sun, Feb 05, 2023 at 05:55:08PM -0700, Simon Glass wrote:
>
> > This converts 1 usage of this option to the non-SPL form, since there is
> > no SPL_SPI_FLASH_BAR defined in Kconfig
> >
> > Signed-off-by: Simon Glass <sjg@chromium.org>
>
> This is used to avoid unused code 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 2c3116ee530..d410ae58953 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -3894,7 +3894,7 @@  void spi_nor_set_fixups(struct spi_nor *nor)
 		}
 	}
 
-	if (CONFIG_IS_ENABLED(SPI_FLASH_BAR) &&
+	if (IS_ENABLED(CONFIG_SPI_FLASH_BAR) &&
 	    !strcmp(nor->info->name, "s25fl256l"))
 		nor->fixups = &s25fl256l_fixups;
 #endif