X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fppc%2Fboot%2Fsimple%2Fmisc-mv64x60.S;h=0978e42e7354dae9f4c03ec444f6e414a4adae68;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=9c809c84f04e9060e386d2edcb0b47258bb7daa3;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/arch/ppc/boot/simple/misc-mv64x60.S b/arch/ppc/boot/simple/misc-mv64x60.S index 9c809c84f..0978e42e7 100644 --- 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 - * + * * 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 */ - 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 - stwbrx r26,0,(r25) + stwbrx r26,0,(r25) 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