diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-04 18:10:04 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-04 18:10:04 -0500 |
| commit | 7e5ee346fc4c26c5f96ae13d599cf31d05fa6772 (patch) | |
| tree | 76c6be869ac6d26ad5ef6dde76ad83d4291591c0 | |
| parent | 0cfccb54014bf488c300dad07b9d1c07d8fcd3f2 (diff) | |
| parent | 019c9b3ea842514b3b4b90f7af01c3dc278a972e (diff) | |
Merge git://git.denx.de/u-boot-sh
- Convert some R-Car Gen3 platforms to DM_SPI{,_FLASH}
| -rw-r--r-- | configs/gose_defconfig | 4 | ||||
| -rw-r--r-- | configs/koelsch_defconfig | 4 | ||||
| -rw-r--r-- | configs/lager_defconfig | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/configs/gose_defconfig b/configs/gose_defconfig index dc8b871bd1..50a3a5adc9 100644 --- a/configs/gose_defconfig +++ b/configs/gose_defconfig @@ -40,7 +40,6 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y CONFIG_CMD_SDRAM=y -CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y @@ -69,7 +68,7 @@ CONFIG_DM_MMC=y CONFIG_RENESAS_SDHI=y CONFIG_MTD=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 @@ -87,6 +86,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SCIF_CONSOLE=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_SH_QSPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index 4b4c4e54e6..a41e01596e 100644 --- a/configs/koelsch_defconfig +++ b/configs/koelsch_defconfig @@ -40,7 +40,6 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y CONFIG_CMD_SDRAM=y -CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y @@ -69,7 +68,7 @@ CONFIG_DM_MMC=y CONFIG_RENESAS_SDHI=y CONFIG_MTD=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 @@ -87,6 +86,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SCIF_CONSOLE=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_SH_QSPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/lager_defconfig b/configs/lager_defconfig index 1d8bbd5307..2bf7fc9c49 100644 --- a/configs/lager_defconfig +++ b/configs/lager_defconfig @@ -40,7 +40,6 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y CONFIG_CMD_SDRAM=y -CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y @@ -71,7 +70,7 @@ CONFIG_SH_MMCIF=y CONFIG_RENESAS_SDHI=y CONFIG_MTD=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 @@ -89,6 +88,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SCIF_CONSOLE=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_SH_QSPI=y CONFIG_USB=y CONFIG_DM_USB=y |