configs: Re-sync with cmd/Kconfig

[people/ms/u-boot.git] / include / configs / usbarmory.h

diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index 4a7702cd092515cf64ca95557bc2f0dd41ad8fb3..8568663c036299537a4371d9020172fe1642de99 100644 (file)
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -14,9 +14,8 @@
 #define CONFIG_MX53
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_SYS_FSL_CLK
 #define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_OF_LIBFDT
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_MXC_GPIO
 
 #include <asm/arch/imx-regs.h>
@@ -24,7 +23,6 @@
 #include <config_distro_defaults.h>
 
 /* U-Boot commands */
-#define CONFIG_CMD_MEMTEST
 
 /* U-Boot environment */
 #define CONFIG_ENV_OVERWRITE
@@ -47,7 +45,6 @@
 #define CONFIG_BAUDRATE                115200
 
 /* SD/MMC */
-#define CONFIG_CMD_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_ESDHC_NUM       1
@@ -55,7 +52,6 @@
 #define CONFIG_GENERIC_MMC
 
 /* USB */
-#define CONFIG_CMD_USB
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_MX5
 #define CONFIG_USB_STORAGE
@@ -64,9 +60,10 @@
 #define CONFIG_MXC_USB_FLAGS   0
 
 /* I2C */
-#define CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
+#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
 
 /* Fuse */
 #define CONFIG_CMD_FUSE