Pull request: u-boot-spi/master

Hi Tom,

Please pull this PR.

thanks,
Jagan.

The following changes since commit 8d5d3bcf3c53d798bd7f3fe7092e994593bcc41c:

  Merge branch '2020-04-16-master-imports' (2020-04-17 11:17:29 -0400)

are available in the Git repository at:

  https://gitlab.denx.de/u-boot/custodians/u-boot-spi master

for you to fetch changes up to 48465bbc84d2f3824641b7627f417e36f515c896:

  mtd: spi-nor-ids: Add Spansion s25fs512s flash entry (2020-04-20 23:55:06 +0530)

----------------------------------------------------------------
Bacem Daassi (1):
      mtd: spi-nor: Enable dual and quad read for s25fl256s0

Jagan Teki (7):
      environment: distro: Add SF distro command
      rk3399: Add boot flash script offset, size
      rockchip: Enable SF distro bootcmd
      spi: sifive: Tidy up dm_spi_slave_platdata variable
      mtd: spi-nor: Enable QE bit for ISSI flash
      mtd: spi-nor-ids: Enable 4B_OPCODES for is25wp256
      watchdog: kconfig: Enable designware for rk3399

Kuldeep Singh (3):
      spi: Transform the FSL QuadSPI driver to use the SPI MEM API
      mtd: spi-nor-ids: Enable SPI_NOR_OCTAL_READ flag for mt35xu*
      mtd: spi-nor-ids: Add Spansion s25fs512s flash entry

Pratyush Yadav (1):
      spi: cadence-qspi: Move ref clock calculation to probe

Rasmus Villemoes (1):
      spi: use is_power_of_2 instead of hweight32 in spi_nor_write()

Robert Marko (2):
      mtd: spi-nand: Import Toshiba SPI-NAND support
      mtd: nand: spi: add support for Toshiba TC58CVG2S0HRAIJ

Tudor Ambarus (1):
      spi: spi-mem: Add SPI_MEM_NO_DATA to the spi_mem_data_dir enum

 drivers/mtd/nand/spi/Makefile     |    2 +-
 drivers/mtd/nand/spi/core.c       |    1 +
 drivers/mtd/nand/spi/toshiba.c    |  201 +++++
 drivers/mtd/spi/spi-nor-core.c    |    6 +-
 drivers/mtd/spi/spi-nor-ids.c     |   12 +-
 drivers/spi/cadence_qspi.c        |   33 +-
 drivers/spi/fsl_qspi.c            | 1577 ++++++++++++++-----------------------
 drivers/spi/fsl_qspi.h            |  145 ----
 drivers/spi/spi-mem.c             |    2 +-
 drivers/spi/spi-sifive.c          |   30 +-
 drivers/watchdog/Kconfig          |    1 +
 include/configs/rk3399_common.h   |    3 +
 include/configs/rockchip-common.h |    9 +-
 include/environment/distro/sf.h   |   41 +
 include/linux/mtd/spi-nor.h       |    1 +
 include/linux/mtd/spinand.h       |    1 +
 include/spi-mem.h                 |    2 +
 17 files changed, 910 insertions(+), 1157 deletions(-)
 create mode 100644 drivers/mtd/nand/spi/toshiba.c
 delete mode 100644 drivers/spi/fsl_qspi.h
 create mode 100644 include/environment/distro/sf.h

On Tue, Apr 21, 2020 at 01:54:04PM +0530, Jagan Teki wrote:

> Hi Tom,
> 
> Please pull this PR.
> 
> thanks,
> Jagan.
> 
> The following changes since commit 8d5d3bcf3c53d798bd7f3fe7092e994593bcc41c:
> 
>   Merge branch '2020-04-16-master-imports' (2020-04-17 11:17:29 -0400)
> 
> are available in the Git repository at:
> 
>   https://gitlab.denx.de/u-boot/custodians/u-boot-spi master
> 
> for you to fetch changes up to 48465bbc84d2f3824641b7627f417e36f515c896:
> 
>   mtd: spi-nor-ids: Add Spansion s25fs512s flash entry (2020-04-20 23:55:06 +0530)
> 

NAK, a handful of boards fail like this:
+(firefly-px30) In file included from include/configs/px30_common.h:52,
+(firefly-px30)                  from include/configs/evb_px30.h:9,
+(firefly-px30)                  from include/config.h:5,
+(firefly-px30)                  from include/common.h:16,
+(firefly-px30)                  from env/common.c:10:
+(firefly-px30) include/config_distro_bootcmd.h:402:2: error: expected '}' before 'BOOTENV_DEV_NAME_SF'
+(firefly-px30)   402 |  BOOTENV_DEV_NAME_##devtypeu(devtypeu, devtypel, instance)
+(firefly-px30)       |  ^~~~~~~~~~~~~~~~~
+(firefly-px30) include/configs/rockchip-common.h:45:31: note: in expansion of macro 'BOOTENV_DEV_NAME'
+(firefly-px30)    45 |  #define BOOT_TARGET_SF(func) func(SF, sf, 0)
+(firefly-px30)       |                               ^~~~
+(firefly-px30) include/configs/rockchip-common.h:55:2: note: in expansion of macro 'BOOT_TARGET_SF'
+(firefly-px30)    55 |  BOOT_TARGET_SF(func)
+(firefly-px30)       |  ^~~~~~~~~~~~~~
+(firefly-px30) include/config_distro_bootcmd.h:404:18: note: in expansion of macro 'BOOT_TARGET_DEVICES'
+(firefly-px30)   404 |  "boot_targets=" BOOT_TARGET_DEVICES(BOOTENV_DEV_NAME) "\0"
+(firefly-px30)       |                  ^~~~~~~~~~~~~~~~~~~
+(firefly-px30) include/config_distro_bootcmd.h:423:2: note: in expansion of macro 'BOOTENV_BOOT_TARGETS'
+(firefly-px30)   423 |  BOOTENV_BOOT_TARGETS \
+(firefly-px30)       |  ^~~~~~~~~~~~~~~~~~~~
+(firefly-px30) include/configs/px30_common.h:58:2: note: in expansion of macro 'BOOTENV'
+(firefly-px30)    58 |  BOOTENV
+(firefly-px30)       |  ^~~~~~~
+(firefly-px30) include/env_default.h:111:2: note: in expansion of macro 'CONFIG_EXTRA_ENV_SETTINGS'
+(firefly-px30)   111 |  CONFIG_EXTRA_ENV_SETTINGS
+(firefly-px30)       |  ^~~~~~~~~~~~~~~~~~~~~~~~~
+(firefly-px30) In file included from env/common.c:26:
+(firefly-px30) include/env_default.h:22:37: note: to match this '{'
+(firefly-px30)    22 | const uchar default_environment[] = {
+(firefly-px30)       |                                     ^
+(firefly-px30) make[2]: *** [env/common.o] Error 1
+(firefly-px30) make[1]: *** [env] Error 2
+(firefly-px30) make: *** [sub-make] Error 2

See https://gitlab.denx.de/u-boot/u-boot/-/jobs/80958 and
https://gitlab.denx.de/u-boot/u-boot/-/jobs/80910