[U-Boot] [PATCH 05/12] arm: mx6: cm-fx6: move CMD configs to defconfig

Nikita Kiryanov
2015-07-23T14:19:32Z

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>
---
configs/cm_fx6_defconfig | 5 +++++
include/configs/cm_fx6.h | 3 ---
2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 6be5c17..25829db 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 f23ef8b..9b00c0d 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 */
--
1.9.1