Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot

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

diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index 70bb25da4527386900349cd386916667aed3ddba..5bacc9d834a34d976d826f54256cfc7a2c1923e6 100644 (file)
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -21,7 +21,6 @@
 /* U-Boot environment */
 #define CONFIG_ENV_OFFSET      (6 * 64 * 1024)
 #define CONFIG_ENV_SIZE                (8 * 1024)
-#define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV 0
 
 /* U-Boot general configurations */
@@ -41,7 +40,6 @@
 #define CONFIG_SYS_FSL_ESDHC_NUM       1
 
 /* USB */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_MX5
 #define CONFIG_MXC_USB_PORT    1
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
@@ -54,7 +52,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
 
 /* Fuse */
-#define CONFIG_CMD_FUSE
 #define CONFIG_FSL_IIM
 
 /* U-Boot memory offsets */