Merge git://www.denx.de/git/u-boot-marvell

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

diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h
index 7b2f1ca4a43427f5584f94d205cdc05fc77d9f6f..075d9c990beaab7284580feb6af98a922a90b5b5 100644 (file)
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -31,8 +31,6 @@
 
 #define CONFIG_SKIP_LOWLEVEL_INIT
 
-#define CONFIG_DISPLAY_CPUINFO
-
 #define CONFIG_SYS_TEXT_BASE           0x23f00000
 
 /*
@@ -46,7 +44,6 @@
 #define CONFIG_USART_ID                        ATMEL_ID_SYS
 #define CONFIG_BAUDRATE                        115200
 
-#define CONFIG_BOOTDELAY 3
 
 /*
  * BOOTP options
@@ -59,8 +56,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_DHCP
 #define CONFIG_CMD_NAND
 
 /* SDRAM */
@@ -114,8 +109,6 @@
 #define CONFIG_SYS_USB_OHCI_REGS_BASE          0x00a00000
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME          "at91sam9263"
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
-#define CONFIG_USB_STORAGE
-#define CONFIG_CMD_FAT
 #endif
 
 #define CONFIG_SYS_LOAD_ADDR                   0x22000000
@@ -144,7 +137,6 @@
                                         sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_LONGHELP
 
 /*