diff options
author | Tom Rini <trini@konsulko.com> | 2017-05-16 00:17:56 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-05-16 12:10:50 (GMT) |
commit | 4125bbcef6a998ce8580a1f5c53c8c93a56a125b (patch) | |
tree | 291b37802625be36bced91db4f86b158e41c2e13 /configs/blanche_defconfig | |
parent | d09ec7f81650425140776995fc9752189ddf7956 (diff) | |
parent | b3125088a3cc362a21aa3bbd0c0e4e74d74a6f2b (diff) | |
download | u-boot-4125bbcef6a998ce8580a1f5c53c8c93a56a125b.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
- Add #undef CONFIG_DM_MMC_OPS to omap3_logic in the SPL build case, to
match other TI platforms in the same situation.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/blanche_defconfig')
-rw-r--r-- | configs/blanche_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig index 5664421..a963802 100644 --- a/configs/blanche_defconfig +++ b/configs/blanche_defconfig @@ -15,8 +15,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y -# CONFIG_MMC is not set -CONFIG_GENERIC_MMC=y +CONFIG_MMC=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y |