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

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

diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index 251094e..637c403 100644 (file)
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -47,7 +47,6 @@
 #define CONFIG_ATMEL_LCD_RGB565
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
-#define CONFIG_BOOTDELAY       3
 
 /*
  * BOOTP options
@@ -146,7 +145,6 @@
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME          "at91sam9x5"
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     3
 #endif
-#define CONFIG_USB_STORAGE
 #endif
 
 #define CONFIG_SYS_LOAD_ADDR           0x22000000      /* load address */