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

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

diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h
index 5aef5b2..036b790 100644 (file)
--- a/include/configs/mecp5200.h
+++ b/include/configs/mecp5200.h
@@ -45,10 +45,11 @@
 #define CONFIG_MECP5200                1       /* ... on MECP5200  board */
 #define CONFIG_MPC5200_DDR      1       /* ... use DDR RAM      */
 
-#define CONFIG_SYS_MPC5XXX_CLKIN       33000000 /* ... running at 33.000000MHz */
+#ifndef CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_TEXT_BASE   0xFFF00000
+#endif
 
-#define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH  */
-#define BOOTFLAG_WARM          0x02    /* Software reboot           */
+#define CONFIG_SYS_MPC5XXX_CLKIN       33000000 /* ... running at 33.000000MHz */
 
 #define CONFIG_HIGH_BATS       1       /* High BATs supported */