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

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

diff --git a/include/configs/eXalion.h b/include/configs/eXalion.h
index fc3174c63f3888a0c0a44e0bcda1d86274e927a2..3238ac7327ae12fc8c33cb5237f6a8fcb37c3c4c 100644 (file)
--- a/include/configs/eXalion.h
+++ b/include/configs/eXalion.h
@@ -40,6 +40,8 @@
 #define CONFIG_MPC8245         1
 #define CONFIG_EXALION         1
 
+#define        CONFIG_SYS_TEXT_BASE    0xFFF00000
+
 #if defined (CONFIG_MPC8240)
     /* #warning         ---------- eXalion with MPC8240 --------------- */
 #elif defined (CONFIG_MPC8245)
@@ -77,7 +79,7 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_FAT
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_PCI
 
 
@@ -91,9 +93,6 @@
 #define CONFIG_SYS_MAXARGS             8       /* max number of command args   */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE       /* Boot Argument Buffer Size    */
 #define CONFIG_SYS_LOAD_ADDR           0x00100000      /* default load address         */
-
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_MISC_INIT_R     1
 
 /*-----------------------------------------------------------------------
@@ -109,7 +108,7 @@
 
 #undef CONFIG_SYS_RAMBOOT
 #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
 
 /*-----------------------------------------------------------------------
  * Definitions for initial stack pointer and data area
@@ -117,11 +116,10 @@
 #define CONFIG_SYS_INIT_DATA_SIZE      128
 
 #define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
-#define CONFIG_SYS_INIT_RAM_END        0x1000
-#define CONFIG_SYS_INIT_DATA_OFFSET    (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_INIT_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_SIZE       0x1000
+#define CONFIG_SYS_INIT_DATA_OFFSET    (CONFIG_SYS_INIT_RAM_SIZE - CONFIG_SYS_INIT_DATA_SIZE)
 
-#define CONFIG_SYS_GBL_DATA_SIZE        256    /* 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_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 
@@ -184,7 +182,6 @@
 #define CONFIG_PCI             1       /* include pci support          */
 #undef CONFIG_PCI_PNP
 
-#define CONFIG_NET_MULTI       1       /* Multi ethernet cards support */
 
 #define CONFIG_EEPRO100                1
 
@@ -412,16 +409,6 @@
 #  define CONFIG_SYS_CACHELINE_SHIFT   5       /* log base 2 of the above value */
 #endif
 
-
-/*-----------------------------------------------------------------------
- * 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 */
 #define CONFIG_DRAM_50MHZ      1
 #define CONFIG_SDRAM_50MHZ