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

[platform/kernel/u-boot.git] / include / configs / GENIETV.h

diff --git a/include/configs/GENIETV.h b/include/configs/GENIETV.h
index 4faafe5..c5ca279 100644 (file)
--- a/include/configs/GENIETV.h
+++ b/include/configs/GENIETV.h
@@ -161,9 +161,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
 
 /*-----------------------------------------------------------------------
@@ -333,14 +332,6 @@
                        MAMR_G0CLA_A11 | MAMR_RLFA_1X | MAMR_WLFA_1X \
                        | MAMR_TLFA_4X) /* 0x5d802114 */
 
-/*
- * 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