Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'

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

diff --git a/include/configs/MPC86xADS.h b/include/configs/MPC86xADS.h
index 233a8d19fa9db0d3600b66a9e9ed672d2aadf296..beada7ee2a4ed704f1bcb85946fff684c85de642 100644 (file)
--- a/include/configs/MPC86xADS.h
+++ b/include/configs/MPC86xADS.h
@@ -28,6 +28,8 @@
 #undef CONFIG_MPC859DSL
 #undef CONFIG_MPC852T
 
+#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
@@ -35,15 +37,15 @@
 
 #define CONFIG_8xx_OSCLK               10000000 /* 10MHz oscillator on EXTCLK  */
 #define CONFIG_8xx_CPUCLK_DEFAULT      50000000
-#define CFG_8xx_CPUCLK_MIN             40000000
-#define CFG_8xx_CPUCLK_MAX             80000000
+#define CONFIG_SYS_8xx_CPUCLK_MIN              40000000
+#define CONFIG_SYS_8xx_CPUCLK_MAX              80000000
 
 #define CONFIG_DRAM_50MHZ       1
 #define CONFIG_SDRAM_50MHZ      1
 
 #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)
 
 #endif /* __CONFIG_H */