atmel: at91sam9x5: add spi flash boot support

[oweals/u-boot.git] / include / configs / MVSMR.h

diff --git a/include/configs/MVSMR.h b/include/configs/MVSMR.h
index 074e55579e2fc02a9a462b6f0fd965aa16e023ba..0b75b7622b765ea338828b9919820ca729e9695d 100644 (file)
--- a/include/configs/MVSMR.h
+++ b/include/configs/MVSMR.h
@@ -32,10 +32,12 @@
 #define CONFIG_MPC5xxx 1
 #define CONFIG_MPC5200         1
 
-#define CONFIG_SYS_MPC5XXX_CLKIN       33000000
+#ifndef CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_TEXT_BASE   0xFF800000
+#endif
+#define CONFIG_SYS_LDSCRIPT    "board/matrix_vision/mvsmr/u-boot.lds"
 
-#define BOOTFLAG_COLD          0x01
-#define BOOTFLAG_WARM          0x02
+#define CONFIG_SYS_MPC5XXX_CLKIN       33000000
 
 #define CONFIG_MISC_INIT_R     1
 
@@ -203,11 +205,10 @@
 #define CONFIG_SYS_DEFAULT_MBAR        0x80000000
 
 #define CONFIG_SYS_INIT_RAM_ADDR       MPC5XXX_SRAM
-#define CONFIG_SYS_INIT_RAM_END        MPC5XXX_SRAM_SIZE
+#define CONFIG_SYS_INIT_RAM_SIZE       MPC5XXX_SRAM_SIZE
 
-#define CONFIG_SYS_GBL_DATA_SIZE       128
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - \
-                                               CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - \
+                                               GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE
@@ -243,7 +244,6 @@
  */
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #undef         CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_PROMPT              "=> "
 #ifdef CONFIG_CMD_KGDB