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

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

diff --git a/include/configs/ppmc7xx.h b/include/configs/ppmc7xx.h
index 04779c40583c15beb5631c26ef96aeed391d42e7..e7584c3a2957fddc5190b2f5755ee66e260f1183 100644 (file)
--- a/include/configs/ppmc7xx.h
+++ b/include/configs/ppmc7xx.h
@@ -49,6 +49,7 @@
 #undef CONFIG_ALTIVEC
 #define CONFIG_BUS_CLK 66000000
 
+#define        CONFIG_SYS_TEXT_BASE    0xFFF00000
 
 /*
  * Monitor configuration
@@ -240,7 +241,7 @@
  * CONFIG_SYS_MALLOC_LEN               - Size of malloc pool (128KB)
  */
 
-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MALLOC_LEN          0x20000
 
 
@@ -414,16 +415,4 @@
 
 #define CONFIG_SYS_BOARD_ASM_INIT
 
-
-/*
- * Boot flags
- *
- * BOOTFLAG_COLD               - Indicates a power-on boot
- * BOOTFLAG_WARM               - Indicates a software reset
- */
-
-#define BOOTFLAG_COLD          0x01
-#define BOOTFLAG_WARM          0x02
-
-
 #endif /* __CONFIG_H */