powerpc: Cleanup BOOTFLAG_* references

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

diff --git a/include/configs/MVSMR.h b/include/configs/MVSMR.h
index 6492068..c125157 100644 (file)
--- a/include/configs/MVSMR.h
+++ b/include/configs/MVSMR.h
@@ -32,10 +32,11 @@
 #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 BOOTFLAG_COLD          0x01
-#define BOOTFLAG_WARM          0x02
+#define CONFIG_SYS_MPC5XXX_CLKIN       33000000
 
 #define CONFIG_MISC_INIT_R     1
 
@@ -177,7 +178,7 @@
 #define CONFIG_SYS_MAX_FLASH_SECT      256
 
 #define CONFIG_SYS_LOWBOOT
-#define CONFIG_SYS_FLASH_BASE          TEXT_BASE
+#define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_FLASH_SIZE          0x00800000
 
 /*
@@ -185,7 +186,6 @@
  */
 #define CONFIG_ENV_IS_IN_FLASH
 #undef CONFIG_SYS_FLASH_PROTECTION
-#define CONFIG_HAS_UID
 #define        CONFIG_OVERWRITE_ETHADDR_ONCE
 
 #define CONFIG_ENV_OFFSET      0x8000
@@ -211,7 +211,7 @@
                                                CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE
 #if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_RAMBOOT             1
 #endif