[U-Boot] [PATCH v6 68/76] configs: Enable MTD uclass in missing configs

Jagan Teki
2016-02-14T20:49:07Z

configs/ls1021atwr_qspi_defconfig | 1 +
include/configs/am43xx_evm.h | 2 +-
include/configs/dra7xx_evm.h | 2 +-
include/configs/ls1021atwr.h | 1 -
include/configs/ls1043a_common.h | 2 +-
5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/ls1021atwr_qspi_defconfig b/configs/ls1021atwr_qspi_defconfig
index 2e8e951..0fb7a60 100644
--- a/configs/ls1021atwr_qspi_defconfig
+++ b/configs/ls1021atwr_qspi_defconfig
@@ -7,6 +7,7 @@ CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
# CONFIG_CMD_SETEXPR is not set
CONFIG_OF_CONTROL=y
CONFIG_DM=y
+CONFIG_MTD=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_M25P80=y
CONFIG_SPI_NOR_MISC=y
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index c3867ef..538771a 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -143,7 +143,7 @@
#ifdef CONFIG_SPL_BUILD
#undef CONFIG_DM_MMC
#undef CONFIG_DM_SPI
-#undef CONFIG_DM_SPI_FLASH
+#undef CONFIG_MTD
#undef CONFIG_TIMER
#endif

diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 9d62421..32137ba 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -144,7 +144,7 @@

#ifdef CONFIG_SPL_BUILD
#undef CONFIG_DM_SPI
-#undef CONFIG_DM_SPI_FLASH
+#undef CONFIG_MTD
#endif

/*
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index ae58646..d70a49b 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -321,7 +321,6 @@
/* DM SPI */
#if defined(CONFIG_FSL_DSPI) || defined(CONFIG_FSL_QSPI)
#define CONFIG_CMD_SF
-#define CONFIG_DM_SPI_FLASH
#endif

/*
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 22b2692..7018cb5 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -203,7 +203,7 @@
#define CONFIG_FSL_DSPI
#ifdef CONFIG_FSL_DSPI
#define CONFIG_CMD_SF
-#define CONFIG_DM_SPI_FLASH
+#define CONFIG_MTD
#define CONFIG_SPI_NOR_STMICRO /* cs0 */
#define CONFIG_SPI_NOR_SST /* cs1 */
#define CONFIG_SPI_NOR_MISC /* cs2 */
--
1.9.1