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 4d8be2b01e85bc6bd0fd0e9550d75d37061878ff..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
  */