Rename TEXT_BASE: fix merge conflicts

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

diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h
index 6dcebe6..24a04eb 100644 (file)
--- a/include/configs/a4m072.h
+++ b/include/configs/a4m072.h
@@ -37,6 +37,8 @@
 #define CONFIG_A4M072          1       /* ... on A4M072 board */
 #define CONFIG_MPC5200_DDR     1       /* ... use DDR RAM */
 
+#define CONFIG_SYS_TEXT_BASE   0xFE000000
+
 #define CONFIG_MISC_INIT_R
 
 #define CONFIG_SYS_MPC5XXX_CLKIN       33000000 /* ... running at 33.000000MHz */
@@ -125,7 +127,7 @@
 #define CONFIG_CMD_PCI
 #endif
 
-#if (TEXT_BASE == 0xFE000000)          /* Boot low with 32 MB Flash */
+#if (CONFIG_SYS_TEXT_BASE == 0xFE000000)               /* Boot low with 32 MB Flash */
 #define CONFIG_SYS_LOWBOOT             1
 #define CONFIG_SYS_LOWBOOT32           1
 #endif
@@ -238,7 +240,7 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - 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