git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
ppc
/
boot
/
simple
/
misc-mv64x60.S
diff --git
a/arch/ppc/boot/simple/misc-mv64x60.S
b/arch/ppc/boot/simple/misc-mv64x60.S
index
9c809c8
..
0978e42
100644
(file)
--- a/
arch/ppc/boot/simple/misc-mv64x60.S
+++ b/
arch/ppc/boot/simple/misc-mv64x60.S
@@
-1,6
+1,6
@@
/*
* arch/ppc/boot/simple/misc-mv64x60.S
/*
* arch/ppc/boot/simple/misc-mv64x60.S
- *
+ *
* Code to change the base address of the host bridges and call board specific
* init routine.
*
* Code to change the base address of the host bridges and call board specific
* init routine.
*
@@
-35,19
+35,19
@@
move_base:
li r23,20
/* Relocate bridge's regs */
li r23,20
/* Relocate bridge's regs */
-
addis
r25,0,CONFIG_MV64X60_BASE@h
- ori r25,r25,MV64x60_INTERNAL_SPACE_DECODE
-
lwbrx
r26,0,(r25)
+
addis
r25,0,CONFIG_MV64X60_BASE@h
+ ori r25,r25,MV64x60_INTERNAL_SPACE_DECODE
+
lwbrx
r26,0,(r25)
lis r24,0xffff
and r26,r26,r24
addis r24,0,CONFIG_MV64X60_NEW_BASE@h
srw r24,r24,r23
or r26,r26,r24
lis r24,0xffff
and r26,r26,r24
addis r24,0,CONFIG_MV64X60_NEW_BASE@h
srw r24,r24,r23
or r26,r26,r24
-
stwbrx r26,0,(r25)
+ stwbrx r26,0,(r25)
sync
/* Wait for write to take effect */
sync
/* Wait for write to take effect */
-
addis
r25,0,CONFIG_MV64X60_NEW_BASE@h
+
addis
r25,0,CONFIG_MV64X60_NEW_BASE@h
ori r25,r25,MV64x60_INTERNAL_SPACE_DECODE
1: lwbrx r24,0,(r25)
cmpw r24,r26
ori r25,r25,MV64x60_INTERNAL_SPACE_DECODE
1: lwbrx r24,0,(r25)
cmpw r24,r26