Replace CONFIG_SYS_GBL_DATA_SIZE by auto-generated value

[oweals/u-boot.git] / include / configs / MHPC.h

diff --git a/include/configs/MHPC.h b/include/configs/MHPC.h
index 8e7f9cdc140291ae09860709869893006e795e64..b9c163856bbb2caa0c46f065036b6a03c1928fe7 100644 (file)
--- a/include/configs/MHPC.h
+++ b/include/configs/MHPC.h
@@ -43,6 +43,8 @@
 #define CONFIG_BOARD_EARLY_INIT_F 1    /* do special hardware init.    */
 #define CONFIG_MISC_INIT_R     1
 
+#define        CONFIG_SYS_TEXT_BASE    0xfe000000
+
 #define CONFIG_8xx_GCLK_FREQ   MPC8XX_SPEED
 #undef CONFIG_8xx_CONS_SMC1
 #define CONFIG_8xx_CONS_SMC2   1       /* Console is on SMC2           */
@@ -177,9 +179,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_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 /*-----------------------------------------------------------------------
@@ -200,7 +201,7 @@
  *
  */
 /* No command line, one static partition, whole device */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV               "nor0"
 #define CONFIG_JFFS2_PART_SIZE         0xFFFFFFFF
 #define CONFIG_JFFS2_PART_OFFSET       0x00000000
@@ -208,7 +209,7 @@
 /* mtdparts command line support */
 /* Note: fake mtd_id used, no linux mtd map file */
 /*
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 #define MTDIDS_DEFAULT         "nor0=mhpc-0"
 #define MTDPARTS_DEFAULT       "mtdparts=mhpc-0:-(jffs2)"
 */
@@ -386,12 +387,4 @@
  */
 #define CONFIG_SYS_DER 0
 
-/*
- * Internal Definitions
- *
- * Boot Flags
- */
-#define BOOTFLAG_COLD  0x01            /* Normal Power-On: Boot from FLASH     */
-#define BOOTFLAG_WARM  0x02            /* Software reboot                      */
-
 #endif /* __CONFIG_H */