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

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

diff --git a/include/configs/atc.h b/include/configs/atc.h
index 24015b7..62e38e1 100644 (file)
--- a/include/configs/atc.h
+++ b/include/configs/atc.h
@@ -37,6 +37,8 @@
 #define CONFIG_ATC             1       /* ...on a ATC board    */
 #define CONFIG_CPM2            1       /* Has a CPM2 */
 
+#define        CONFIG_SYS_TEXT_BASE    0xFF000000
+
 /*
  * select serial console configuration
  *
@@ -256,7 +258,7 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_SDRAM_MAX_SIZE      0x08000000      /* max. 128 MB          */
-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MONITOR_LEN         (192 << 10)     /* Reserve 192 kB for Monitor */
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()*/
 
@@ -280,14 +282,6 @@
 #define CONFIG_ENV_SIZE                2048
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS      4       /* 16-byte page size    */
 #endif
-/*
- * Internal Definitions
- *
- * Boot Flags
- */
-#define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH*/
-#define BOOTFLAG_WARM          0x02    /* Software reboot                 */
-
 
 /*-----------------------------------------------------------------------
  * Cache Configuration