projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot/master' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
include
/
configs
/
MPC885ADS.h
diff --git
a/include/configs/MPC885ADS.h
b/include/configs/MPC885ADS.h
index
f4d1842
..
eeb2355
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_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
#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 CONFIG_8xx_OSCLK 10000000 /* 10 MHz oscillator on EXTCLK */
#define CONFIG_8xx_CPUCLK_DEFAULT 50000000
-#define C
FG_8xx_CPUCLK_MIN
40000000
-#define C
FG_8xx_CPUCLK_MAX
133000000
+#define C
ONFIG_SYS_8xx_CPUCLK_MIN
40000000
+#define C
ONFIG_SYS_8xx_CPUCLK_MAX
133000000
#define CONFIG_SDRAM_50MHZ 1
#include "../../board/fads/fads.h"
#define CONFIG_SDRAM_50MHZ 1
#include "../../board/fads/fads.h"
-#define C
FG_OR5_PRELIM
0xFFFF8110 /* 64Kbyte address space */
-#define C
FG_BR5_PRELIM (CFG
_PHYDEV_ADDR | BR_PS_8 | BR_V)
+#define C
ONFIG_SYS_OR5_PRELIM
0xFFFF8110 /* 64Kbyte address space */
+#define C
ONFIG_SYS_BR5_PRELIM (CONFIG_SYS
_PHYDEV_ADDR | BR_PS_8 | BR_V)
#define CONFIG_HAS_ETH1
#define CONFIG_HAS_ETH1