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

[u-boot.git] / include / configs / at91rm9200ek.h

diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index 6f1f65fb3cd18a7c8ac586a7402d89f0b9d0579f..53e191a312ab541f61459f743b14f32a5e3e2e17 100644 (file)
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -56,13 +56,6 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
-#define CONFIG_CMD_BOOTZ
-#define CONFIG_OF_LIBFDT
-
-#define CONFIG_SYS_GENERIC_BOARD
-
 /*
  * Memory Configuration
  */
@@ -117,16 +110,9 @@
 #define CONFIG_USART_BASE      ATMEL_BASE_DBGU
 #define CONFIG_USART_ID                0/* ignored in arm */
 
-#define CONFIG_BAUDRATE                        115200
-
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_USB
 
 /*
  * Network Driver Setting
@@ -154,9 +140,6 @@
 #define CONFIG_USB_ATMEL                       1
 #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
 #define CONFIG_USB_OHCI_NEW                    1
-#define CONFIG_USB_KEYBOARD                    1
-#define CONFIG_USB_STORAGE                     1
-#define CONFIG_DOS_PARTITION                   1
 
 #define CONFIG_SYS_USB_OHCI_CPU_INIT           1
 #define CONFIG_SYS_USB_OHCI_REGS_BASE          ATMEL_USB_HOST_BASE
@@ -181,7 +164,6 @@
 /*
  * Boot option
  */
-#define CONFIG_BOOTDELAY               3
 
 /* default load address */
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_SDRAM_BASE + SZ_16M
@@ -193,8 +175,6 @@
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT              "U-Boot> "
 #define CONFIG_SYS_CBSIZE              256     /* Console I/O Buffer Size */
 #define CONFIG_SYS_MAXARGS             16      /* max number of command args */
 /* Print Buffer Size */