Merge 'u-boot-atmel/master' into 'u-boot-arm/master'

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

diff --git a/include/configs/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h
index fa70a09f6aecd1831ce50fd4834cbf11e06e673d..329e4e36012e4403f3cc69b6b92c0ba20dbb1dd9 100644 (file)
--- a/include/configs/cmi_mpc5xx.h
+++ b/include/configs/cmi_mpc5xx.h
@@ -38,6 +38,8 @@
 #define CONFIG_MPC555          1               /* This is an MPC555 CPU                */
 #define CONFIG_CMI             1               /* Using the customized cmi board       */
 
+#define        CONFIG_SYS_TEXT_BASE    0x02000000      /* Boot from flash at location 0x00000000 */
+
 /* Serial Console Configuration */
 #define        CONFIG_5xx_CONS_SCI1
 #undef CONFIG_5xx_CONS_SCI2
@@ -60,6 +62,7 @@
 #include <config_cmd_default.h>
 
 #undef CONFIG_CMD_NET          /* disabeled - causes compile errors */
+#undef CONFIG_CMD_NFS
 
 #define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_LOADB
@@ -69,7 +72,7 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_BDI
 #define CONFIG_CMD_CONSOLE
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_RUN
 #define CONFIG_CMD_IMI
 
@@ -127,9 +130,8 @@
  * Definitions for initial stack pointer and data area
  */
 #define CONFIG_SYS_INIT_RAM_ADDR       (CONFIG_SYS_IMMR + 0x003f9800)  /* Physical start adress of internal MPC555 writable RAM */
-#define        CONFIG_SYS_INIT_RAM_END (CONFIG_SYS_IMMR + 0x003fffff)  /* Physical end adress of internal MPC555 used RAM area */
-#define        CONFIG_SYS_GBL_DATA_SIZE        64                      /* Size in bytes reserved for initial global data */
-#define CONFIG_SYS_GBL_DATA_OFFSET     ((CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_INIT_RAM_ADDR) - CONFIG_SYS_GBL_DATA_SIZE) /* Offset from the beginning of ram */
+#define        CONFIG_SYS_INIT_RAM_SIZE        (CONFIG_SYS_IMMR + 0x003fffff)  /* Physical end adress of internal MPC555 used RAM area */
+#define CONFIG_SYS_GBL_DATA_OFFSET     ((CONFIG_SYS_INIT_RAM_SIZE - CONFIG_SYS_INIT_RAM_ADDR) - GENERATED_GBL_DATA_SIZE) /* Offset from the beginning of ram */
 #define        CONFIG_SYS_INIT_SP_ADDR 0x013fa000              /* Physical start adress of inital stack */
 
 /*
@@ -142,7 +144,7 @@
 #define ANYBUS_BASE            0x03010000      /* Anybus Module */
 
 #define CONFIG_SYS_RESET_ADRESS        0x01000000      /* Adress which causes reset */
-#define        CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE   /* TEXT_BASE is defined in the board config.mk file.    */
+#define        CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE   /* CONFIG_SYS_TEXT_BASE is defined in the board config.mk file. */
                                                /* This adress is given to the linker with -Ttext to    */
                                                /* locate the text section at this adress.              */
 #define        CONFIG_SYS_MONITOR_LEN          (192 << 10)     /* Reserve 192 kB for Monitor                           */
@@ -267,13 +269,4 @@
  */
 #define CONFIG_SYS_DER                 0x00000000
 
-
-/*
- * Internal Definitions
- *
- * Boot Flags
- */
-#define        BOOTFLAG_COLD   0x01                    /* Normal Power-On: Boot from FLASH     */
-#define BOOTFLAG_WARM  0x02                    /* Software reboot                      */
-
 #endif /* __CONFIG_H */