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

[platform/kernel/u-boot.git] / include / configs / apx4devkit.h

diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h
index bb29f3f..92fea87 100644 (file)
--- a/include/configs/apx4devkit.h
+++ b/include/configs/apx4devkit.h
@@ -83,7 +83,6 @@
 #ifdef CONFIG_CMD_USB
 #define CONFIG_EHCI_MXS_PORT1
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        1
-#define CONFIG_USB_STORAGE
 #endif
 
 /* RTC */
@@ -93,7 +92,6 @@
 #endif
 
 /* Boot Linux */
-#define CONFIG_BOOTDELAY               1
 #define CONFIG_BOOTFILE                        "uImage"
 #define CONFIG_BOOTCOMMAND             "run bootcmd_nand"
 #define CONFIG_LOADADDR                        0x41000000