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

[J-u-boot.git] / include / configs / MBX860T.h

diff --git a/include/configs/MBX860T.h b/include/configs/MBX860T.h
index 4cb3a696cdea911221a0d647272e1240ed465580..969ba7e245f00ea6f557a19acc97eeae470efcbf 100644 (file)
--- a/include/configs/MBX860T.h
+++ b/include/configs/MBX860T.h
@@ -28,6 +28,8 @@
 #define CONFIG_MPC860T         1
 #define CONFIG_MBX             1
 
+#define        CONFIG_SYS_TEXT_BASE    0xfe000000
+
 #define CONFIG_8xx_CPUCLOCK    40
 #define CONFIG_8xx_BUSCLOCK    (CONFIG_8xx_CPUCLOCK)
 #define TARGET_SYSTEM_FREQUENCY 40
@@ -50,6 +52,8 @@
 #undef CONFIG_8xx_TFTP_MODE
 #endif
 
+#define CONFIG_MISC_INIT_R
+
 #define CONFIG_DRAM_SPEED      (CONFIG_8xx_BUSCLOCK)   /* MHz          */
 #define CONFIG_BOOTCOMMAND     "bootm FE020000"        /* autoboot command */
 #define CONFIG_BOOTARGS                " "
@@ -94,9 +98,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)
@@ -280,14 +283,6 @@
                         MAMR_RLFA_1X    | MAMR_WLFA_1X    | MAMR_TLFA_4X)
 
 #define CONFIG_SYS_MAMR                0x13821000
-/*
- * Internal Definitions
- *
- * Boot Flags
- */
-#define        BOOTFLAG_COLD                   0x01            /* Normal Power-On: Boot from FLASH     */
-#define BOOTFLAG_WARM                  0x02            /* Software reboot                      */
-
 
 /* values according to the manual */
 
@@ -379,6 +374,7 @@
 */
 #define NR_8259_INTS   0
 
+#define CONFIG_CMD_NET
 /*
  * MPC8xx CPM Options
  */