Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[u-boot] / include / configs / usbarmory.h

diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index f29ab2d2d798ca42d666965558e409993bd72b58..714e3e2ca2160cbb7292603349411086d0119164 100644 (file)
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -20,13 +20,11 @@
 #define CONFIG_MXC_GPIO
 
 #include <asm/arch/imx-regs.h>
-#include <config_cmd_default.h>
 
 #include <config_distro_defaults.h>
 
 /* U-Boot commands */
 #define CONFIG_CMD_MEMTEST
-#undef CONFIG_CMD_IMLS
 
 /* U-Boot environment */
 #define CONFIG_ENV_OVERWRITE
@@ -69,6 +67,8 @@
 #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