Merge branch 'u-boot/master'

[karo-tx-uboot.git] / include / configs / MPC885ADS.h

diff --git a/include/configs/MPC885ADS.h b/include/configs/MPC885ADS.h
index 1867c5bf0a2c30837891acdb7ee1e81b585ac861..eeb2355b9f0abd671978f738c8eb49efaf6298a2 100644 (file)
--- a/include/configs/MPC885ADS.h
+++ b/include/configs/MPC885ADS.h
@@ -15,6 +15,8 @@
 
 #define CONFIG_MPC885          1       /* MPC885 CPU (Duet family) */
 
+#define        CONFIG_SYS_TEXT_BASE    0xFE000000
+
 #define        CONFIG_8xx_CONS_SMC1    1       /* Console is on SMC1 */
 #undef CONFIG_8xx_CONS_SMC2
 #undef CONFIG_8xx_CONS_NONE
@@ -22,15 +24,15 @@
 
 #define CONFIG_8xx_OSCLK               10000000 /* 10 MHz oscillator on EXTCLK  */
 #define CONFIG_8xx_CPUCLK_DEFAULT      50000000
-#define CFG_8xx_CPUCLK_MIN             40000000
-#define CFG_8xx_CPUCLK_MAX             133000000
+#define CONFIG_SYS_8xx_CPUCLK_MIN              40000000
+#define CONFIG_SYS_8xx_CPUCLK_MAX              133000000
 
 #define CONFIG_SDRAM_50MHZ      1
 
-#include "fads.h"
+#include "../../board/fads/fads.h"
 
-#define CFG_OR5_PRELIM         0xFFFF8110      /* 64Kbyte address space */
-#define CFG_BR5_PRELIM         (CFG_PHYDEV_ADDR | BR_PS_8 | BR_V)
+#define CONFIG_SYS_OR5_PRELIM          0xFFFF8110      /* 64Kbyte address space */
+#define CONFIG_SYS_BR5_PRELIM          (CONFIG_SYS_PHYDEV_ADDR | BR_PS_8 | BR_V)
 
 #define CONFIG_HAS_ETH1