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

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

diff --git a/include/configs/MVSMR.h b/include/configs/MVSMR.h
index ec93245ef214ad11fa774874067f8ffa9af85e37..f7fd9b2eb039d3e7e58c0b03e7eedc231d897ad4 100644 (file)
--- a/include/configs/MVSMR.h
+++ b/include/configs/MVSMR.h
@@ -38,9 +38,6 @@
 
 #define CONFIG_SYS_MPC5XXX_CLKIN       33000000
 
-#define BOOTFLAG_COLD          0x01
-#define BOOTFLAG_WARM          0x02
-
 #define CONFIG_MISC_INIT_R     1
 
 #define CONFIG_SYS_CACHELINE_SIZE      32
@@ -207,11 +204,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