Merge branch 'elf_reloc'

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

diff --git a/include/configs/CPU86.h b/include/configs/CPU86.h
index 0927f2c..233d36b 100644 (file)
--- a/include/configs/CPU86.h
+++ b/include/configs/CPU86.h
@@ -37,6 +37,12 @@
 #define CONFIG_CPU86           1       /* ...on a CPU86 board  */
 #define CONFIG_CPM2            1       /* Has a CPM2 */
 
+#ifdef CONFIG_BOOT_ROM
+#define CONFIG_SYS_TEXT_BASE   0xFF800000
+#else
+#define        CONFIG_SYS_TEXT_BASE    0xFF000000
+#endif
+
 /*
  * select serial console configuration
  *
@@ -333,15 +339,6 @@
 #define CONFIG_ENV_SIZE                (2048 - 512)
 #endif
 
-/*
- * Internal Definitions
- *
- * Boot Flags
- */
-#define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH*/
-#define BOOTFLAG_WARM          0x02    /* Software reboot                 */
-
-
 /*-----------------------------------------------------------------------
  * Cache Configuration
  */