From: Tom Rini <trini@konsulko.com>
Date: Wed, 4 Dec 2019 23:10:04 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-sh
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=7e5ee346fc4c26c5f96ae13d599cf31d05fa6772;p=u-boot.git

Merge git://git.denx.de/u-boot-sh

- Convert some R-Car Gen3 platforms to DM_SPI{,_FLASH}
---

7e5ee346fc4c26c5f96ae13d599cf31d05fa6772
diff --cc configs/gose_defconfig
index dc8b871bd1,6a3a1d2dd7..50a3a5adc9
--- a/configs/gose_defconfig
+++ b/configs/gose_defconfig
@@@ -68,8 -67,8 +67,8 @@@ CONFIG_SYS_I2C_RCAR_IIC=
  CONFIG_DM_MMC=y
  CONFIG_RENESAS_SDHI=y
  CONFIG_MTD=y
 -CONFIG_MTD_DEVICE=y
 +CONFIG_DM_MTD=y
- CONFIG_SPI_FLASH=y
+ CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_SPANSION=y
  CONFIG_SPI_FLASH_MTD=y
  CONFIG_PHY_MICREL=y
diff --cc configs/koelsch_defconfig
index 4b4c4e54e6,75ee093655..a41e01596e
--- a/configs/koelsch_defconfig
+++ b/configs/koelsch_defconfig
@@@ -68,8 -67,8 +67,8 @@@ CONFIG_SYS_I2C_RCAR_IIC=
  CONFIG_DM_MMC=y
  CONFIG_RENESAS_SDHI=y
  CONFIG_MTD=y
 -CONFIG_MTD_DEVICE=y
 +CONFIG_DM_MTD=y
- CONFIG_SPI_FLASH=y
+ CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_SPANSION=y
  CONFIG_SPI_FLASH_MTD=y
  CONFIG_PHY_MICREL=y
diff --cc configs/lager_defconfig
index 1d8bbd5307,6dff5234c6..2bf7fc9c49
--- a/configs/lager_defconfig
+++ b/configs/lager_defconfig
@@@ -70,8 -69,8 +69,8 @@@ CONFIG_DM_MMC=
  CONFIG_SH_MMCIF=y
  CONFIG_RENESAS_SDHI=y
  CONFIG_MTD=y
 -CONFIG_MTD_DEVICE=y
 +CONFIG_DM_MTD=y
- CONFIG_SPI_FLASH=y
+ CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH_SPANSION=y
  CONFIG_SPI_FLASH_MTD=y
  CONFIG_PHY_MICREL=y