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 'master' of git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
board
/
freescale
/
mpc8641hpcn
/
mpc8641hpcn.c
diff --git
a/board/freescale/mpc8641hpcn/mpc8641hpcn.c
b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
index
ce26320
..
a8b2112
100644
(file)
--- a/
board/freescale/mpc8641hpcn/mpc8641hpcn.c
+++ b/
board/freescale/mpc8641hpcn/mpc8641hpcn.c
@@
-310,11
+310,12
@@
get_board_sys_clk(ulong dummy)
{
u8 i, go_bit, rd_clks;
ulong val = 0;
{
u8 i, go_bit, rd_clks;
ulong val = 0;
+ u8 *pixis_base = (u8 *)PIXIS_BASE;
- go_bit = in
8(PIXIS_BASE
+ PIXIS_VCTL);
+ go_bit = in
_8(pixis_base
+ PIXIS_VCTL);
go_bit &= 0x01;
go_bit &= 0x01;
- rd_clks = in
8(PIXIS_BASE
+ PIXIS_VCFGEN0);
+ rd_clks = in
_8(pixis_base
+ PIXIS_VCFGEN0);
rd_clks &= 0x1C;
/*
rd_clks &= 0x1C;
/*
@@
-325,11
+326,11
@@
get_board_sys_clk(ulong dummy)
if (go_bit) {
if (rd_clks == 0x1c)
if (go_bit) {
if (rd_clks == 0x1c)
- i = in
8(PIXIS_BASE
+ PIXIS_AUX);
+ i = in
_8(pixis_base
+ PIXIS_AUX);
else
else
- i = in
8(PIXIS_BASE
+ PIXIS_SPD);
+ i = in
_8(pixis_base
+ PIXIS_SPD);
} else {
} else {
- i = in
8(PIXIS_BASE
+ PIXIS_SPD);
+ i = in
_8(pixis_base
+ PIXIS_SPD);
}
i &= 0x07;
}
i &= 0x07;
@@
-373,7
+374,9
@@
int board_eth_init(bd_t *bis)
void board_reset(void)
{
void board_reset(void)
{
- out8(PIXIS_BASE + PIXIS_RST, 0);
+ u8 *pixis_base = (u8 *)PIXIS_BASE;
+
+ out_8(pixis_base + PIXIS_RST, 0);
while (1)
;
while (1)
;