[U-Boot] [PATCH v6 63/76] configs: Use CONFIG_SPI_NOR_BAR

CONFIG_SPI_FLASH_BAR => CONFIG_SPI_NOR_BAR

Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com Cc: Mugunthan V N mugunthanvnm@ti.com Cc: Michal Simek michal.simek@xilinx.com Cc: Siva Durga Prasad Paladugu sivadur@xilinx.com Signed-off-by: Jagan Teki jteki@openedev.com --- configs/alt_defconfig | 2 +- configs/am437x_sk_evm_defconfig | 2 +- configs/am43xx_evm_defconfig | 2 +- configs/am57xx_evm_defconfig | 2 +- configs/bg0900_defconfig | 2 +- configs/dra72_evm_defconfig | 2 +- configs/dra74_evm_defconfig | 2 +- configs/dra7xx_evm_defconfig | 2 +- configs/ds414_defconfig | 2 +- configs/gose_defconfig | 2 +- configs/koelsch_defconfig | 2 +- configs/lager_defconfig | 2 +- configs/maxbcm_defconfig | 2 +- configs/mx6sxsabreauto_defconfig | 2 +- configs/mx6sxsabresd_defconfig | 2 +- configs/porter_defconfig | 2 +- configs/silk_defconfig | 2 +- configs/stout_defconfig | 2 +- configs/zynq_zc702_defconfig | 2 +- configs/zynq_zc706_defconfig | 2 +- configs/zynq_zc770_xm010_defconfig | 2 +- configs/zynq_zc770_xm013_defconfig | 2 +- configs/zynq_zed_defconfig | 2 +- doc/SPI/README.ti_qspi_dra_test | 2 +- drivers/spi/fsl_qspi.c | 18 +++++++++--------- include/configs/T102xQDS.h | 2 +- include/configs/T102xRDB.h | 2 +- include/configs/T104xRDB.h | 2 +- include/configs/T208xQDS.h | 2 +- include/configs/T208xRDB.h | 2 +- include/configs/gw_ventana.h | 2 +- include/configs/km/kmp204x-common.h | 2 +- include/configs/ls2080ardb.h | 2 +- include/configs/mx6ul_14x14_evk.h | 2 +- include/configs/mx7dsabresd.h | 2 +- include/configs/socfpga_common.h | 4 ++-- include/linux/mtd/spi-nor.h | 2 +- 37 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/configs/alt_defconfig b/configs/alt_defconfig index 7f61e4b..2fd873c 100644 --- a/configs/alt_defconfig +++ b/configs/alt_defconfig @@ -19,5 +19,5 @@ CONFIG_TARGET_ALT=y CONFIG_SH_SDHI=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/am437x_sk_evm_defconfig b/configs/am437x_sk_evm_defconfig index 3ffe224..f077f70 100644 --- a/configs/am437x_sk_evm_defconfig +++ b/configs/am437x_sk_evm_defconfig @@ -21,6 +21,6 @@ CONFIG_SYS_NS16550=y CONFIG_TI_QSPI=y CONFIG_DM_SPI=y CONFIG_MTD=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_TIMER=y CONFIG_OMAP_TIMER=y diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index f090426..73b16ac 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -8,7 +8,7 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SYS_NS16550=y CONFIG_TI_QSPI=y diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index 510b8d1..68b7278 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -18,5 +18,5 @@ CONFIG_DM=y CONFIG_DM_MMC=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_SYS_NS16550=y diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig index cfc5f75..6cd2692 100644 --- a/configs/bg0900_defconfig +++ b/configs/bg0900_defconfig @@ -6,5 +6,5 @@ CONFIG_SPL=y CONFIG_CMD_GPIO=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/dra72_evm_defconfig b/configs/dra72_evm_defconfig index 1442d96..46e5692 100644 --- a/configs/dra72_evm_defconfig +++ b/configs/dra72_evm_defconfig @@ -17,7 +17,7 @@ CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SYS_NS16550=y CONFIG_TI_QSPI=y diff --git a/configs/dra74_evm_defconfig b/configs/dra74_evm_defconfig index cecf443..a096dd2 100644 --- a/configs/dra74_evm_defconfig +++ b/configs/dra74_evm_defconfig @@ -15,7 +15,7 @@ CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 39d8e91..56f362a 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -11,7 +11,7 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_NFS is not set CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SYS_NS16550=y CONFIG_TI_QSPI=y diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig index f43d358..a4ccc52 100644 --- a/configs/ds414_defconfig +++ b/configs/ds414_defconfig @@ -10,7 +10,7 @@ CONFIG_SPL=y CONFIG_SPL_OF_TRANSLATE=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART_BASE=0xd0012000 diff --git a/configs/gose_defconfig b/configs/gose_defconfig index 23b1617..040cbaa 100644 --- a/configs/gose_defconfig +++ b/configs/gose_defconfig @@ -19,5 +19,5 @@ CONFIG_TARGET_GOSE=y CONFIG_SH_SDHI=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index 521a937..5bae9b4 100644 --- a/configs/koelsch_defconfig +++ b/configs/koelsch_defconfig @@ -19,5 +19,5 @@ CONFIG_TARGET_KOELSCH=y CONFIG_SH_SDHI=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/lager_defconfig b/configs/lager_defconfig index 95f030f..ada450d 100644 --- a/configs/lager_defconfig +++ b/configs/lager_defconfig @@ -19,5 +19,5 @@ CONFIG_TARGET_LAGER=y CONFIG_SH_SDHI=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig index 5fb993d..03ab40e 100644 --- a/configs/maxbcm_defconfig +++ b/configs/maxbcm_defconfig @@ -10,7 +10,7 @@ CONFIG_SPL=y CONFIG_SPL_OF_TRANSLATE=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/mx6sxsabreauto_defconfig b/configs/mx6sxsabreauto_defconfig index 4dd2f8f..3616c82 100644 --- a/configs/mx6sxsabreauto_defconfig +++ b/configs/mx6sxsabreauto_defconfig @@ -8,5 +8,5 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig index e248f0e..5f8adba 100644 --- a/configs/mx6sxsabresd_defconfig +++ b/configs/mx6sxsabresd_defconfig @@ -8,4 +8,4 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y diff --git a/configs/porter_defconfig b/configs/porter_defconfig index 52036a9..7fff267 100644 --- a/configs/porter_defconfig +++ b/configs/porter_defconfig @@ -19,5 +19,5 @@ CONFIG_TARGET_PORTER=y CONFIG_SH_SDHI=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/silk_defconfig b/configs/silk_defconfig index 343ee9f..82f9034 100644 --- a/configs/silk_defconfig +++ b/configs/silk_defconfig @@ -19,5 +19,5 @@ CONFIG_TARGET_SILK=y CONFIG_SH_SDHI=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/stout_defconfig b/configs/stout_defconfig index bc502e7..7572ade 100644 --- a/configs/stout_defconfig +++ b/configs/stout_defconfig @@ -19,5 +19,5 @@ CONFIG_TARGET_STOUT=y CONFIG_SH_SDHI=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_SPI_FLASH_SPANSION=y diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index 2de47e8..8c96a2e 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -14,7 +14,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index 58ecda9..ce9a2ef 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -15,7 +15,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig index c272beb..f45b043 100644 --- a/configs/zynq_zc770_xm010_defconfig +++ b/configs/zynq_zc770_xm010_defconfig @@ -16,7 +16,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_SST=y diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig index 382ef8f..63199af 100644 --- a/configs/zynq_zc770_xm013_defconfig +++ b/configs/zynq_zc770_xm013_defconfig @@ -16,5 +16,5 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_ZYNQ_GEM=y diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index f5c5167..d7eb77d 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -15,7 +15,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y -CONFIG_SPI_FLASH_BAR=y +CONFIG_SPI_NOR_BAR=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/doc/SPI/README.ti_qspi_dra_test b/doc/SPI/README.ti_qspi_dra_test index fe37857..bff1be1 100644 --- a/doc/SPI/README.ti_qspi_dra_test +++ b/doc/SPI/README.ti_qspi_dra_test @@ -22,7 +22,7 @@ Commands to erase/write u-boot/mlo to flash device -------------------------------------------------- U-Boot# sf probe 0 SF: Detected S25FL256S_64K with page size 256 Bytes, erase size 64 KiB, total 32 MiB, mapped at 5c000000 -SF: Warning - Only lower 16MiB accessible, Full access #define CONFIG_SPI_FLASH_BAR +SF: Warning - Only lower 16MiB accessible, Full access #define CONFIG_SPI_NOR_BAR U-Boot# sf erase 0 0x10000 SF: 65536 bytes @ 0x0 Erased: OK U-Boot# sf erase 0x20000 0x10000 diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c index cb8d929..1c4cb72 100644 --- a/drivers/spi/fsl_qspi.c +++ b/drivers/spi/fsl_qspi.c @@ -38,7 +38,7 @@ DECLARE_GLOBAL_DATA_PTR; #define SEQID_PP 6 #define SEQID_RDID 7 #define SEQID_BE_4K 8 -#ifdef CONFIG_SPI_FLASH_BAR +#ifdef CONFIG_SPI_NOR_BAR #define SEQID_BRRD 9 #define SEQID_BRWR 10 #define SEQID_RDEAR 11 @@ -178,7 +178,7 @@ static void qspi_set_lut(struct fsl_qspi_priv *priv)

/* Fast Read */ lut_base = SEQID_FAST_READ * 4; -#ifdef CONFIG_SPI_FLASH_BAR +#ifdef CONFIG_SPI_NOR_BAR qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_FAST_READ) | PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) | @@ -214,7 +214,7 @@ static void qspi_set_lut(struct fsl_qspi_priv *priv)

/* Erase a sector */ lut_base = SEQID_SE * 4; -#ifdef CONFIG_SPI_FLASH_BAR +#ifdef CONFIG_SPI_NOR_BAR qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_SE) | PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) | PAD1(LUT_PAD1) | INSTR1(LUT_ADDR)); @@ -245,7 +245,7 @@ static void qspi_set_lut(struct fsl_qspi_priv *priv)

/* Page Program */ lut_base = SEQID_PP * 4; -#ifdef CONFIG_SPI_FLASH_BAR +#ifdef CONFIG_SPI_NOR_BAR qspi_write32(priv->flags, &regs->lut[lut_base], OPRND0(QSPI_CMD_PP) | PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) | PAD1(LUT_PAD1) | INSTR1(LUT_ADDR)); @@ -291,7 +291,7 @@ static void qspi_set_lut(struct fsl_qspi_priv *priv) PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(ADDR24BIT) | PAD1(LUT_PAD1) | INSTR1(LUT_ADDR));

-#ifdef CONFIG_SPI_FLASH_BAR +#ifdef CONFIG_SPI_NOR_BAR /* * BRRD BRWR RDEAR WREAR are all supported, because it is hard to * dynamically check whether to set BRRD BRWR or RDEAR WREAR during @@ -430,7 +430,7 @@ static void qspi_init_ahb_read(struct fsl_qspi_priv *priv) } #endif

-#ifdef CONFIG_SPI_FLASH_BAR +#ifdef CONFIG_SPI_NOR_BAR /* Bank register read/write, EAR register read/write */ static void qspi_op_rdbank(struct fsl_qspi_priv *priv, u8 *rxbuf, u32 len) { @@ -601,7 +601,7 @@ static void qspi_op_write(struct fsl_qspi_priv *priv, u8 *txbuf, u32 len)

/* Default is page programming */ seqid = SEQID_PP; -#ifdef CONFIG_SPI_FLASH_BAR +#ifdef CONFIG_SPI_NOR_BAR if (priv->cur_seqid == QSPI_CMD_BRWR) seqid = SEQID_BRWR; else if (priv->cur_seqid == QSPI_CMD_WREAR) @@ -735,7 +735,7 @@ int qspi_xfer(struct fsl_qspi_priv *priv, unsigned int bitlen, wr_sfaddr = swab32(txbuf) & OFFSET_BITS_MASK; } else if ((priv->cur_seqid == QSPI_CMD_BRWR) || (priv->cur_seqid == QSPI_CMD_WREAR)) { -#ifdef CONFIG_SPI_FLASH_BAR +#ifdef CONFIG_SPI_NOR_BAR wr_sfaddr = 0; #endif } @@ -752,7 +752,7 @@ int qspi_xfer(struct fsl_qspi_priv *priv, unsigned int bitlen, qspi_op_rdid(priv, din, bytes); else if (priv->cur_seqid == QSPI_CMD_RDSR) qspi_op_rdsr(priv, din, bytes); -#ifdef CONFIG_SPI_FLASH_BAR +#ifdef CONFIG_SPI_NOR_BAR else if ((priv->cur_seqid == QSPI_CMD_BRRD) || (priv->cur_seqid == QSPI_CMD_RDEAR)) { priv->sf_addr = 0; diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index e5df784..d446309 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -583,7 +583,7 @@ unsigned long get_board_ddr_clk(void); #ifndef CONFIG_SPL_BUILD #endif #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH_BAR +#define CONFIG_SPI_NOR_BAR #define CONFIG_SF_DEFAULT_SPEED 10000000 #define CONFIG_SF_DEFAULT_MODE 0

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 3cda3b1..01424ce 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -573,7 +573,7 @@ unsigned long get_board_ddr_clk(void); #elif defined(CONFIG_T1023RDB) #endif #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH_BAR +#define CONFIG_SPI_NOR_BAR #define CONFIG_SF_DEFAULT_SPEED 10000000 #define CONFIG_SF_DEFAULT_MODE 0

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 5fc3497..34ba4a4 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -537,7 +537,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg /* * eSPI - Enhanced SPI */ -#define CONFIG_SPI_FLASH_BAR +#define CONFIG_SPI_NOR_BAR #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 #define CONFIG_SF_DEFAULT_MODE 0 diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 2acf079..26bbb74 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -554,7 +554,7 @@ unsigned long get_board_ddr_clk(void); #endif

#define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH_BAR +#define CONFIG_SPI_NOR_BAR #define CONFIG_SF_DEFAULT_SPEED 10000000 #define CONFIG_SF_DEFAULT_MODE 0 #endif diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 3b9f2f7..2857c6a 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -504,7 +504,7 @@ unsigned long get_board_ddr_clk(void); * eSPI - Enhanced SPI */ #ifdef CONFIG_MTD_SPI_NOR -#define CONFIG_SPI_FLASH_BAR +#define CONFIG_SPI_NOR_BAR #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 #define CONFIG_SF_DEFAULT_MODE 0 diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 01db2ec..2f15876 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -69,7 +69,7 @@ #ifdef CONFIG_CMD_SF #define CONFIG_MXC_SPI #define CONFIG_SPI_FLASH_MTD - #define CONFIG_SPI_FLASH_BAR + #define CONFIG_SPI_NOR_BAR #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 /* GPIO 3-19 (21248) */ diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 6860ad2..612020d 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -296,7 +296,7 @@ int get_scl(void); /* * eSPI - Enhanced SPI */ -#define CONFIG_SPI_FLASH_BAR /* 4 byte-addressing */ +#define CONFIG_SPI_NOR_BAR /* 4 byte-addressing */ #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 20000000 #define CONFIG_SF_DEFAULT_MODE 0 diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index a0c808e..2b00ba2 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -259,7 +259,7 @@ unsigned long get_board_sys_clk(void); #define CONFIG_CMD_SF #define CONFIG_MTD_SPI_NOR #define CONFIG_MTD_M25P80 -#define CONFIG_SPI_FLASH_BAR +#define CONFIG_SPI_NOR_BAR #endif

/* diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 861715a..34c0989 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -199,7 +199,7 @@ #define CONFIG_CMD_SF #define CONFIG_MTD_SPI_NOR #define CONFIG_MTD_M25P80 -#define CONFIG_SPI_FLASH_BAR +#define CONFIG_SPI_NOR_BAR #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 40000000 diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 4db5f76..a8248ac 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -266,7 +266,7 @@ #define CONFIG_MTD_SPI_NOR #define CONFIG_MTD_M25P80 #define CONFIG_SPI_FLASH_MACRONIX -#define CONFIG_SPI_FLASH_BAR +#define CONFIG_SPI_NOR_BAR #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 40000000 diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 8de0ab9..a1a3a09 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -92,7 +92,7 @@ #define CONFIG_CMD_SPI #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH_BAR +#define CONFIG_SPI_NOR_BAR /* * The base address is configurable in QSys, each board must specify the * base address based on it's particular FPGA configuration. Please note @@ -218,7 +218,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #endif #define CONFIG_CQSPI_DECODER 0 #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH_BAR +#define CONFIG_SPI_NOR_BAR

/* * Designware SPI support diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index fb32c9f..daa4a5f 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -205,7 +205,7 @@ struct spi_nor { u8 read_opcode; u8 read_dummy; u8 program_opcode; -#ifdef CONFIG_SPI_FLASH_BAR +#ifdef CONFIG_SPI_NOR_BAR u8 bar_read_opcode; u8 bar_program_opcode; u8 bank_curr;