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

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

diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index 14a8436..5fdda1a 100644 (file)
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -51,7 +51,6 @@
 #define CONFIG_ATMEL_LCD_RGB565
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
-#define CONFIG_BOOTDELAY               3
 
 /*
  * BOOTP options
@@ -67,14 +66,7 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_BOOTZ
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_DHCP
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_SF
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_USB
 
 #define CONFIG_NR_DRAM_BANKS           1
 #define CONFIG_SYS_SDRAM_BASE          0x20000000
@@ -162,7 +154,6 @@
 #define CONFIG_SYS_USB_OHCI_REGS_BASE  ATMEL_BASE_OHCI
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME  "at91sam9n12"
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     1
-#define CONFIG_USB_STORAGE
 #endif
 
 #ifdef CONFIG_SYS_USE_SPIFLASH
@@ -222,7 +213,6 @@
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_HUSH_PARSER
 
 /*
  * Size of malloc() pool