summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-02-05 21:41:47 -0700
committerSimon Glass <sjg@chromium.org>2015-02-12 10:35:35 -0700
commit70c45aeb433d1c4c8f970927aba0cd45d701a7ae (patch)
treeaa68a83c2c872306bc296337a944332c58edd991
parent7b051c5235d6c82cbb396e4419e8d90c7d7635e7 (diff)
downloadu-boot-imx-70c45aeb433d1c4c8f970927aba0cd45d701a7ae.zip
u-boot-imx-70c45aeb433d1c4c8f970927aba0cd45d701a7ae.tar.gz
u-boot-imx-70c45aeb433d1c4c8f970927aba0cd45d701a7ae.tar.bz2
dm: mx6: Move driver model CONFIGs to Kconfig
Remove driver model CONFIGs from the board config headers and use Kconfig instead. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--configs/cm_fx6_defconfig3
-rw-r--r--include/configs/cm_fx6.h4
2 files changed, 3 insertions, 4 deletions
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 3c0d64f..d2ebf69 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -2,3 +2,6 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_CM_FX6=y
+CONFIG_DM=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_SERIAL=y
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 1f64495..4008306 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -21,13 +21,9 @@
#define CONFIG_MACH_TYPE 4273
#ifndef CONFIG_SPL_BUILD
-#define CONFIG_DM
-#define CONFIG_CMD_DM
-#define CONFIG_DM_GPIO
#define CONFIG_CMD_GPIO
-#define CONFIG_DM_SERIAL
#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)
#endif