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

[karo-tx-uboot.git] / include / configs / TOP860.h

diff --git a/include/configs/TOP860.h b/include/configs/TOP860.h
index b9e450df67b78ebcce859cfc36c9aae12cc21787..3a01292e29cd24cad63f006a2edb4a153dd01c02 100644 (file)
--- a/include/configs/TOP860.h
+++ b/include/configs/TOP860.h
@@ -53,6 +53,9 @@
 #define CONFIG_MPC860  1       /* This is a MPC860 CPU         */
 #define CONFIG_MPC860T 1       /* even better... an FEC!       */
 #define CONFIG_TOP860  1       /* ...on a TOP860 module        */
+
+#define        CONFIG_SYS_TEXT_BASE    0x80000000
+
 #undef CONFIG_WATCHDOG                 /* watchdog disabled            */
 #define        CONFIG_IDENT_STRING " EMK TOP860"
 
@@ -200,7 +203,6 @@
 /*-----------------------------------------------------------------------
  * defines we need to get FEC running
  */
-#define        CONFIG_NET_MULTI        1       /* the only way to get the FEC in */
 #define CONFIG_FEC_ENET                1       /* Ethernet only via FEC        */
 #define        FEC_ENET                1       /* eth.c needs it that way... */
 #define CONFIG_SYS_DISCOVER_PHY        1
@@ -212,7 +214,7 @@
  * adresses
  */
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor   */
-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MALLOC_LEN          (128 << 10)     /* Reserve 128 kB for malloc()  */
 
 /*-----------------------------------------------------------------------
@@ -227,9 +229,8 @@
  * Definitions for initial stack pointer and data area (in DPRAM)
  */
 #define CONFIG_SYS_INIT_RAM_ADDR       CONFIG_SYS_IMMR
-#define CONFIG_SYS_INIT_RAM_END        0x2f00  /* End of used area in DPRAM    */
-#define CONFIG_SYS_GBL_DATA_SIZE       64  /* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_SIZE       0x2f00  /* Size of used area in DPRAM   */
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_VPD_SIZE       256 /* size in bytes reserved for vpd buffer */
 #define CONFIG_SYS_INIT_VPD_OFFSET     (CONFIG_SYS_GBL_DATA_OFFSET - CONFIG_SYS_INIT_VPD_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      (CONFIG_SYS_INIT_VPD_OFFSET-8)
@@ -246,14 +247,6 @@
 */
 #define FEC_INTERRUPT  SIU_LEVEL1      /* FEC interrupt */
 
-/*
- * Internal Definitions
- *
- * Boot Flags
- */
-#define BOOTFLAG_COLD  0x01            /* Normal Power-On: Boot from FLASH     */
-#define BOOTFLAG_WARM  0x02            /* Software reboot                      */
-
 /*-----------------------------------------------------------------------
  * Debug Enable Register
  *-----------------------------------------------------------------------