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

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

diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index 7c8281c..f2bc26a 100644 (file)
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -69,17 +69,17 @@
 #include <config_cmd_default.h>
 
 /*
- * CONFIG_MK_RAM defines if u-boot is loaded via BDM (or started from
+ * CONFIG_RAM defines if u-boot is loaded via BDM (or started from
  * a different bootloader that has already performed RAM setup) or
  * started directly from flash, which is the regular case for production
  * boards.
  */
-#ifdef CONFIG_MK_RAM
+#ifdef CONFIG_RAM
 #define CONFIG_MONITOR_IS_IN_RAM
-#define CONFIG_TEXT_BASE               0x40020000
+#define CONFIG_SYS_TEXT_BASE           0x40020000
 #define ENABLE_JFFS    0
 #else
-#define CONFIG_TEXT_BASE               0x00000000
+#define CONFIG_SYS_TEXT_BASE           0x00000000
 #define ENABLE_JFFS    1
 #endif
 
@@ -343,7 +343,7 @@
 #define CONFIG_SYS_FLASH_BASE          0x00000000
 
 #ifdef CONFIG_MONITOR_IS_IN_RAM
-#define CONFIG_SYS_MONITOR_BASE                CONFIG_TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
 #else
 /* This is mainly used during relocation in start.S */
 #define CONFIG_SYS_MONITOR_BASE                (CONFIG_SYS_FLASH_BASE + 0x400)