summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJagan Teki <jagan@amarulasolutions.com>2020-10-23 13:56:49 +0530
committerJagan Teki <jagan@amarulasolutions.com>2020-12-18 16:16:36 +0530
commit538fe2f4eccb444ffab9305f45ec286c8e4e46ee (patch)
treea51936c40b1ff0644366516bf6c3aee3f544533b
parent9ca54ef263c050c715a20945a645e5d7c6bdcfff (diff)
downloadu-boot-538fe2f4eccb444ffab9305f45ec286c8e4e46ee.tar.gz
u-boot-538fe2f4eccb444ffab9305f45ec286c8e4e46ee.tar.xz
u-boot-538fe2f4eccb444ffab9305f45ec286c8e4e46ee.zip
cm_fx6: Switch to full DM-aware
Enable DM_SPI/DM_SPI_FLASH with a related config option. Build fine, but not tested. Cc: Nikita Kiryanov <nikita@compulab.co.il> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
-rw-r--r--configs/cm_fx6_defconfig3
-rw-r--r--include/configs/cm_fx6.h7
2 files changed, 3 insertions, 7 deletions
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 654a4fcc48..86e4135b11 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -54,10 +54,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_ENV_OVERWRITE=y
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_BOUNCE_BUFFER=y
CONFIG_DWC_AHSATA=y
# CONFIG_DWC_AHSATA_AHCI is not set
@@ -85,6 +87,7 @@ CONFIG_DM_ETH=y
CONFIG_MII=y
CONFIG_DM_PMIC=y
CONFIG_DM_REGULATOR=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
CONFIG_MXC_UART=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 72eb19b581..9892fb8817 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -150,13 +150,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