Merge branch 'master' of /home/wd/git/u-boot/master

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

diff --git a/include/configs/kvme080.h b/include/configs/kvme080.h
index 7eabefa3a3f8894a340111ba34fb74a339f6a2b4..95fc2437dd5b7bec976d1f1ee1113b05c21e1eb0 100644 (file)
--- a/include/configs/kvme080.h
+++ b/include/configs/kvme080.h
@@ -28,6 +28,8 @@
 #define CONFIG_MPC8245         1
 #define CONFIG_KVME080         1
 
+#define        CONFIG_SYS_TEXT_BASE    0xFFF00000
+
 #define CONFIG_CONS_INDEX      1
 
 #define CONFIG_BAUDRATE                115200
@@ -115,9 +117,8 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
-#define CONFIG_SYS_INIT_RAM_END        0x1000
-#define CONFIG_SYS_GBL_DATA_SIZE       128
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_SIZE       0x1000
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_FLASH_BASE          0x7C000000
@@ -268,7 +269,4 @@
 #define CONFIG_SYS_DBAT3L      CONFIG_SYS_IBAT3L
 #define CONFIG_SYS_DBAT3U      CONFIG_SYS_IBAT3U
 
-#define BOOTFLAG_COLD  0x01
-#define BOOTFLAG_WARM  0x02
-
 #endif /* __CONFIG_H */