Merge branch 'elf_reloc'

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

diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h
index 5db1379e07307fc57a83290b24787e8fe6f59142..75b8e600e573b1c3d0424d5295d25b424c587f7c 100644 (file)
--- a/include/configs/sorcery.h
+++ b/include/configs/sorcery.h
@@ -31,6 +31,8 @@
 #define CONFIG_MPC8220         1
 #define CONFIG_SORCERY         1       /* Sorcery board */
 
+#define        CONFIG_SYS_TEXT_BASE    0xfff00000
+
 #define CONFIG_HIGH_BATS       1       /* High BATs supported */
 
 /* Input clock running at 60Mhz, read Hid1 for the CPU multiplier to
@@ -38,9 +40,6 @@
 #define CONFIG_SYS_MPC8220_CLKIN       60000000 /* ... running at 60MHz */
 #define CONFIG_SYS_MPC8220_SYSPLL_VCO_MULTIPLIER 8 /* VCO multiplier can't be read from any register */
 
-#define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH */
-#define BOOTFLAG_WARM          0x02    /* Software reboot      */
-
 /*
  * Serial console configuration
  */
@@ -234,7 +233,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