[02/16] cm_fx6: Switch to full DM-aware

Message ID 20200613135455.181483-3-jagan@amarulasolutions.com
State New
Headers show
Series
  • spi: dm-conversion (part3)
Related show

Commit Message

Jagan Teki June 13, 2020, 1:54 p.m.
Enable DM_SPI/DM_SPI_FLASH with a related config option.

Build fine, but not tested.

Patch-cc: Nikita Kiryanov <nikita at compulab.co.il>
Signed-off-by: Jagan Teki <jagan at amarulasolutions.com>
---
 configs/cm_fx6_defconfig | 3 +++
 include/configs/cm_fx6.h | 7 -------
 2 files changed, 3 insertions(+), 7 deletions(-)

Patch

diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index edaa8e24a5..a55a021a75 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -53,10 +53,12 @@  CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:768k(uboot),256k(uboot-environment),-(reserved)"
 CONFIG_OF_CONTROL=y
+CONFIG_SPL_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6q-cm-fx6"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_SPL_DM=y
 CONFIG_DWC_AHSATA=y
 # CONFIG_DWC_AHSATA_AHCI is not set
 CONFIG_DM_KEYBOARD=y
@@ -83,6 +85,7 @@  CONFIG_DM_ETH=y
 CONFIG_MII=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_MXC_SPI=y
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 302907dcfb..55761450b1 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -151,13 +151,6 @@ 
 /* APBH DMA is required for NAND support */
 #endif
 
-/* SPI Flash Configs */
-#if defined(CONFIG_SPL_BUILD)
-#undef CONFIG_DM_SPI
-#undef CONFIG_DM_SPI_FLASH
-#undef CONFIG_SPI_FLASH_MTD
-#endif
-
 /* Ethernet */
 #define CONFIG_FEC_MXC
 #define CONFIG_FEC_MXC_PHYADDR		0