diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-11 17:40:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-11 17:40:00 -0400 |
| commit | 497c7598c4e713eb9ad88fd7963e57b21b8b35e1 (patch) | |
| tree | f19605acb6bd9fe66a756fa46eb41361bc853a19 /configs/db-88f6281-bp-nand_defconfig | |
| parent | 610e1487c8921d266f5cb304bfb66eb71f1dc7dc (diff) | |
| parent | 18c56605c6cd45cb3e1ea39e2a9df46d4eade7ae (diff) | |
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-spi
- Enable DM_SPI on siemens omap boards (Jagan)
- Dropped some non-dm supported omap3 boards (Jagan)
- Dropped non-dm code in omap3 spi driver (Jagan)
- Dropped non-dm code in kirkwood spi driver (Bhargav)
Diffstat (limited to 'configs/db-88f6281-bp-nand_defconfig')
| -rw-r--r-- | configs/db-88f6281-bp-nand_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configs/db-88f6281-bp-nand_defconfig b/configs/db-88f6281-bp-nand_defconfig index f98e462d42..5a580f28b5 100644 --- a/configs/db-88f6281-bp-nand_defconfig +++ b/configs/db-88f6281-bp-nand_defconfig @@ -20,7 +20,6 @@ CONFIG_CMD_DM=y CONFIG_CMD_IDE=y CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y -CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y @@ -43,7 +42,7 @@ CONFIG_DM=y CONFIG_MVSATA_IDE=y CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y -CONFIG_SPI_FLASH=y +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHY_MARVELL=y CONFIG_DM_ETH=y @@ -53,6 +52,7 @@ CONFIG_DM_RTC=y CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y |