projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
[oweals/u-boot.git]
/
include
/
configs
/
MPC8544DS.h
diff --git
a/include/configs/MPC8544DS.h
b/include/configs/MPC8544DS.h
index a428e88ef3148aa700a5619b8791fff7b50013b1..b650874225425733a14d7f78e9b9565a42288630 100644
(file)
--- a/
include/configs/MPC8544DS.h
+++ b/
include/configs/MPC8544DS.h
@@
-196,7
+196,12
@@
extern unsigned long get_board_sys_clk(unsigned long dummy);
#define PIXIS_VSPEED1 0x18 /* VELA VSpeed 1 */
#define PIXIS_VCLKH 0x19 /* VELA VCLKH register */
#define PIXIS_VCLKL 0x1A /* VELA VCLKL register */
#define PIXIS_VSPEED1 0x18 /* VELA VSpeed 1 */
#define PIXIS_VCLKH 0x19 /* VELA VCLKH register */
#define PIXIS_VCLKL 0x1A /* VELA VCLKL register */
+#define PIXIS_VSPEED2 0x1d /* VELA VSpeed 2 */
#define CFG_PIXIS_VBOOT_MASK 0x40 /* Reset altbank mask*/
#define CFG_PIXIS_VBOOT_MASK 0x40 /* Reset altbank mask*/
+#define PIXIS_VSPEED2_TSEC1SER 0x2
+#define PIXIS_VSPEED2_TSEC3SER 0x1
+#define PIXIS_VCFGEN1_TSEC1SER 0x20
+#define PIXIS_VCFGEN1_TSEC3SER 0x40
/* define to use L1 as initial stack */
/* define to use L1 as initial stack */
@@
-389,14
+394,14
@@
extern unsigned long get_board_sys_clk(unsigned long dummy);
/*
* Environment
*/
/*
* Environment
*/
-#define C
FG_ENV_IS_IN_FLASH
1
+#define C
ONFIG_ENV_IS_IN_FLASH
1
#if CFG_MONITOR_BASE > 0xfff80000
#if CFG_MONITOR_BASE > 0xfff80000
-#define C
FG_ENV_ADDR
0xfff80000
+#define C
ONFIG_ENV_ADDR
0xfff80000
#else
#else
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x70000)
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x70000)
#endif
#endif
-#define C
FG_ENV_SIZE
0x2000
-#define C
FG_ENV_SECT_SIZE
0x10000 /* 64K (one sector) */
+#define C
ONFIG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* 64K (one sector) */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */