Merge branch 'master' of git://git.denx.de/u-boot-spi

- Drop zipitz2 board (Tom)
- Add DEPRECATED option (Tom)
- Mark legacy or non-dm drivers as DEPRECATED (Jagan)

diff --combined Kconfig
index 31e7500,4363088..6b44256
--- 1/Kconfig
--- 2/Kconfig
+++ b/Kconfig
@@@ -20,6 -20,13 +20,13 @@@ config BROKE
          This option cannot be enabled. It is used as dependency
          for broken and incomplete features.
  
+ config DEPRECATED
+       bool
+       help
+         This option cannot be enabled.  It it used as a dependency for
+         code that relies on deprecated features that will be removed and
+         the conversion deadline has passed.
+ 
  config LOCALVERSION
        string "Local version - append to U-Boot release"
        help
@@@ -138,8 -145,6 +145,8 @@@ config SYS_MALLOC_F_LE
        depends on SYS_MALLOC_F
        default 0x1000 if AM33XX
        default 0x2800 if SANDBOX
 +      default 0x2000 if (ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7 || \
 +                         ARCH_MX7ULP || ARCH_MX6 || ARCH_MX5)
        default 0x400
        help
          Before relocation, memory is very limited on many platforms. Still,
@@@ -253,23 -258,6 +260,23 @@@ config BUILD_TARGE
          special image will be automatically built upon calling
          make / buildman.
  
 +config SYS_CUSTOM_LDSCRIPT
 +      bool "Use a custom location for the U-Boot linker script"
 +      help
 +        Normally when linking U-Boot we will look in the board directory,
 +        the CPU directory and finally the "cpu" directory of the architecture
 +        for the ile "u-boot.lds" and use that as our linker.  However, in
 +        some cases we need to provide a different linker script.  To do so,
 +        enable this option and then provide the location under
 +        CONFIG_SYS_LDSCRIPT.
 +
 +config SYS_LDSCRIPT
 +      depends on SYS_CUSTOM_LDSCRIPT
 +      string "Custom ldscript location"
 +      help
 +        Path within the source tree to the linker script to use for the
 +        main U-Boot binary.
 +
  endmenu               # General setup
  
  menu "Boot images"

diff --combined Makefile
index c55ffa2,ea0ea0f..9fba74d
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -928,6 -928,14 +928,14 @@@ cmd_cfgcheck = $(srctree)/scripts/check
                $(srctree)/scripts/config_whitelist.txt $(srctree)
  
  all:          $(ALL-y)
+ ifeq ($(CONFIG_DEPRECATED),y)
+       $(warning "You have deprecated configuration options enabled in your .config! Please check your configuration.")
+ ifeq ($(CONFIG_SPI),y)
+ ifneq ($(CONFIG_DM_SPI)$(CONFIG_OF_CONTROL),yy)
+       $(warning "The relevant config item with associated code will remove in v2019.07 release.")
+ endif
+ endif
+ endif
  ifeq ($(CONFIG_DM_I2C_COMPAT)$(CONFIG_SANDBOX),y)
        @echo >&2 "===================== WARNING ======================"
        @echo >&2 "This board uses CONFIG_DM_I2C_COMPAT. Please remove"
@@@ -1004,17 -1012,6 +1012,6 @@@ ifeq ($(CONFIG_OF_EMBED),y
        @echo >&2 "See doc/README.fdt-control for more info."
        @echo >&2 "===================================================="
  endif
- ifeq ($(CONFIG_SPI),y)
- ifneq ($(CONFIG_DM_SPI)$(CONFIG_OF_CONTROL),yy)
-       @echo >&2 "===================== WARNING ======================"
-       @echo >&2 "This board does not use CONFIG_DM_SPI. Please update"
-       @echo >&2 "the board before v2019.04 for no dm conversion"
-       @echo >&2 "and v2019.07 for partially dm converted drivers."
-       @echo >&2 "Failure to update can lead to driver/board removal"
-       @echo >&2 "See doc/driver-model/MIGRATION.txt for more info."
-       @echo >&2 "===================================================="
- endif
- endif
  ifeq ($(CONFIG_SPI_FLASH),y)
  ifneq ($(CONFIG_DM_SPI_FLASH)$(CONFIG_OF_CONTROL),yy)
        @echo >&2 "===================== WARNING ======================"
@@@ -1087,10 -1084,6 +1084,10 @@@ endi
  
  u-boot.bin: u-boot-fit-dtb.bin FORCE
        $(call if_changed,copy)
 +
 +u-boot-dtb.bin: u-boot-nodtb.bin dts/dt.dtb FORCE
 +      $(call if_changed,cat)
 +
  else ifeq ($(CONFIG_OF_SEPARATE),y)
  u-boot-dtb.bin: u-boot-nodtb.bin dts/dt.dtb FORCE
        $(call if_changed,cat)

diff --combined drivers/spi/Kconfig
index 04ddb32,8249b21..9469147
--- 1/drivers/spi/Kconfig
--- 2/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@ -239,14 -239,6 +239,14 @@@ config STM32_QSP
          used to access the SPI NOR flash chips on platforms embedding
          this ST IP core.
  
 +config STM32_SPI
 +      bool "STM32 SPI driver"
 +      depends on ARCH_STM32MP
 +      help
 +        Enable the STM32 Serial Peripheral Interface (SPI) driver for STM32MP
 +        SoCs. This uses driver model and requires a device tree binding to
 +        operate.
 +
  config TEGRA114_SPI
        bool "nVidia Tegra114 SPI driver"
        help
@@@ -322,6 -314,7 +322,7 @@@ endif # if DM_SP
  
  config SOFT_SPI
        bool "Soft SPI driver"
+       depends on DM_SPI || (DEPRECATED && !DM_SPI)
        help
         Enable Soft SPI driver. This driver is to use GPIO simulate
         the SPI protocol.
@@@ -362,6 -355,7 +363,7 @@@ config DAVINCI_SP
  
  config SH_SPI
        bool "SuperH SPI driver"
+       depends on DEPRECATED
        help
          Enable the SuperH SPI controller driver. This driver can be used
          on various SuperH SoCs, such as SH7757.
@@@ -380,6 -374,7 +382,7 @@@ config KIRKWOOD_SP
  
  config LPC32XX_SSP
        bool "LPC32XX SPI Driver"
+       depends on DEPRECATED
        help
          Enable support for SPI on LPC32xx
  
@@@ -391,6 -386,7 +394,7 @@@ config MXC_SP
  
  config MXS_SPI
        bool "MXS SPI Driver"
+       depends on DEPRECATED
        help
          Enable the MXS SPI controller driver. This driver can be used
          on the i.MX23 and i.MX28 SoCs.

diff --combined env/Kconfig
index 5651685,9320816..b943917
--- 1/env/Kconfig
--- 2/env/Kconfig
+++ b/env/Kconfig
@@@ -2,12 -2,18 +2,12 @@@ menu "Environment
  
  config ENV_IS_NOWHERE
        bool "Environment is not stored"
 -      depends on !ENV_IS_IN_EEPROM
 -      depends on !ENV_IS_IN_EXT4
 -      depends on !ENV_IS_IN_FAT
 -      depends on !ENV_IS_IN_FLASH
 -      depends on !ENV_IS_IN_MMC
 -      depends on !ENV_IS_IN_NAND
 -      depends on !ENV_IS_IN_NVRAM
 -      depends on !ENV_IS_IN_ONENAND
 -      depends on !ENV_IS_IN_REMOTE
 -      depends on !ENV_IS_IN_SPI_FLASH
 -      depends on !ENV_IS_IN_UBI
 -      default y
 +      default y if !ENV_IS_IN_EEPROM && !ENV_IS_IN_EXT4 && \
 +                   !ENV_IS_IN_FAT && !ENV_IS_IN_FLASH && \
 +                   !ENV_IS_IN_MMC && !ENV_IS_IN_NAND && \
 +                   !ENV_IS_IN_NVRAM && !ENV_IS_IN_ONENAND && \
 +                   !ENV_IS_IN_REMOTE && !ENV_IS_IN_SPI_FLASH && \
 +                   !ENV_IS_IN_UBI
        help
          Define this if you don't want to or can't have an environment stored
          on a storage medium. In this case the environment will still exist
@@@ -287,7 -293,7 +287,7 @@@ config ENV_IS_IN_REMOT
  
  config ENV_IS_IN_SPI_FLASH
        bool "Environment is in SPI flash"
-       depends on !CHAIN_OF_TRUST
+       depends on !CHAIN_OF_TRUST && SPI
        default y if ARMADA_XP
        default y if INTEL_BAYTRAIL
        default y if INTEL_BRASWELL