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

[u-boot] / include / configs / eb_cpux9k2.h

diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h
index eb05e2a0b06cc390c6d60ecee7e83996cb7e9dc6..9371ec31f3357c932dac8b147aea2e0102ec7fd8 100644 (file)
--- a/include/configs/eb_cpux9k2.h
+++ b/include/configs/eb_cpux9k2.h
@@ -44,7 +44,12 @@
 #define MACH_TYPE_EB_CPUX9K2           1977
 #define CONFIG_MACH_TYPE               MACH_TYPE_EB_CPUX9K2
 /*--------------------------------------------------------------------------*/
-#define CONFIG_SYS_TEXT_BASE           0x00000000
+#ifndef CONFIG_RAMBOOT
+#define CONFIG_SYS_TEXT_BASE           0x00000000
+#else
+#define CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_SYS_TEXT_BASE           0x21f00000
+#endif
 #define CONFIG_SYS_LOAD_ADDR           0x21000000  /* default load address */
 
 #define CONFIG_SYS_BOOT_SIZE           0x00 /* 0 KBytes */
@@ -61,8 +66,6 @@
 #define CONFIG_SYS_PBSIZE      \
        (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 
-#define CONFIG_STACKSIZE       (32*1024)       /* regular stack */
-
 /*
  * ARM asynchronous clock
  */
@@ -188,8 +191,6 @@
  * UART/CONSOLE
  */
 
-#define CONFIG_SYS_BAUDRATE_TABLE      { 115200, 19200, 38400, 57600, 9600 }
-
 #define CONFIG_BAUDRATE 115200
 #define CONFIG_ATMEL_USART
 #define CONFIG_USART_BASE      ATMEL_BASE_DBGU
@@ -288,8 +289,6 @@
 #define CONFIG_SYS_NAND_BASE           0x40000000
 #define CONFIG_SYS_NAND_DBW_8          1
 
-#define CONFIG_SYS_64BIT_VSPRINTF      1
-
 /* Status LED's */
 
 #define CONFIG_STATUS_LED              1