Merge branch 'for-wd-master' of git://git.denx.de/u-boot-pxa

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

diff --git a/include/configs/km8xx.h b/include/configs/km8xx.h
index b5552d217ce007a57f30b1871e7e584bdf5754ce..7683fe542e562eab865ab179a270bf0d1b29d89f 100644 (file)
--- a/include/configs/km8xx.h
+++ b/include/configs/km8xx.h
@@ -107,9 +107,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
-#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
 
 /*-----------------------------------------------------------------------
@@ -271,16 +270,8 @@
 #define CONFIG_SYS_BR3_PRELIM  (0x30000401)
 #endif
 
-/*
- * Internal Definitions
- *
- * Boot Flags
- */
-#define BOOTFLAG_COLD  0x01    /* Normal Power-On: Boot from FLASH */
-#define BOOTFLAG_WARM  0x02    /* Software reboot                  */
-
 #define CONFIG_SCC3_ENET
-#define CONFIG_ETHPRIME                "SCC ETHERNET"
+#define CONFIG_ETHPRIME                "SCC"
 #define CONFIG_HAS_ETH0
 
 /* pass open firmware flat tree */