Merge git://git.denx.de/u-boot-mmc

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

diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index c92ad8523807de09af41373c4f4720873069e69e..9ce0a8f9bf550e2a44f1a0f6f4240d437e4e7450 100644 (file)
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -25,9 +25,6 @@
  */
 #ifdef CONFIG_RAMBOOT
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_TEXT_BASE 0x20100000
-#else
-#define CONFIG_SYS_TEXT_BASE 0x10000000
 #endif
 
 /*
@@ -56,8 +53,6 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /*
  * Memory Configuration
  */
@@ -112,8 +107,6 @@
 #define CONFIG_USART_BASE      ATMEL_BASE_DBGU
 #define CONFIG_USART_ID                0/* ignored in arm */
 
-#define CONFIG_BAUDRATE                        115200
-
 /*
  * Command line configuration.
  */
@@ -144,9 +137,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
@@ -156,7 +146,6 @@
 /*
  * Environment Settings
  */
-#define CONFIG_ENV_IS_IN_FLASH
 
 /*
  * after u-boot.bin
@@ -179,14 +168,6 @@
 /*
  * Shell Settings
  */
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE              256     /* Console I/O Buffer Size */
-#define CONFIG_SYS_MAXARGS             16      /* max number of command args */
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE              \
-               (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 
 /*
  * Size of malloc() pool