summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Kiryanov <nikita@compulab.co.il>2015-07-23 17:19:32 +0300
committerStefano Babic <sbabic@denx.de>2015-08-02 10:51:37 +0200
commit7d731e3a9ac88329d508ded2886a2e28c21b655f (patch)
tree5b0839ea2331a1ae49cd4298bc1f6a3917cfb626
parentb406f90342751a9534a00ab8f702a3b23ebbdd04 (diff)
arm: mx6: cm-fx6: move CMD configs to defconfig
Move CONFIG_CMD_* options that can be selected in menuconfig to cm-fx6 defconfig. Cc: Stefano Babic <sbabic@denx.de> Cc: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
-rw-r--r--configs/cm_fx6_defconfig5
-rw-r--r--include/configs/cm_fx6.h3
2 files changed, 5 insertions, 3 deletions
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 6be5c179ee..25829dbf45 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -9,4 +9,9 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_PING=y
CONFIG_SPI_FLASH=y
+CONFIG_CMD_SF=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_USB=y
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index f23ef8b01f..9b00c0d2f2 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -50,7 +50,6 @@
sizeof(CONFIG_SYS_PROMPT) + 16)
/* SPI flash */
-#define CONFIG_CMD_SF
#define CONFIG_SF_DEFAULT_BUS 0
#define CONFIG_SF_DEFAULT_CS 0
#define CONFIG_SF_DEFAULT_SPEED 25000000
@@ -199,7 +198,6 @@
#define CONFIG_NET_RETRY_COUNT 5
/* USB */
-#define CONFIG_CMD_USB
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_MX6
#define CONFIG_USB_STORAGE
@@ -212,7 +210,6 @@
#define CONFIG_SYS_STDIO_DEREGISTER
/* I2C */
-#define CONFIG_CMD_I2C
#define CONFIG_SYS_I2C
#define CONFIG_SYS_I2C_MXC
#define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */