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

[u-boot] / include / configs / Adder.h

diff --git a/include/configs/Adder.h b/include/configs/Adder.h
index 4d7c5172c28fce842052553f982859e7f645361b..48e6df5c279168d312ffcb00fba1626f3f46ffc3 100644 (file)
--- a/include/configs/Adder.h
+++ b/include/configs/Adder.h
@@ -170,9 +170,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       128  /* 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
 
 /*-----------------------------------------------------------------------
@@ -209,14 +208,6 @@
  */
 #define CONFIG_SYS_CACHELINE_SIZE      16      /* For all MPC8xx chips                 */
 
-/*-----------------------------------------------------------------------
- * Internal Definitions
- *
- * Boot Flags
- */
-#define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from flash     */
-#define BOOTFLAG_WARM          0x02    /* Software reboot                      */
-
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT       1
 #define CONFIG_OF_BOARD_SETUP  1