[U-Boot] [PATCH] PowerPC: Don't destroy fixup table while doing fixups
The fixup procedure just stored a constant value in the fixup table rather than just adjusting the table. Although that doesn't seem to do any harm, it prevents relocation more that once.
Signed-off-by: Joakim Tjernlund Joakim.Tjernlund@transmode.se --- arch/powerpc/cpu/74xx_7xx/start.S | 2 +- arch/powerpc/cpu/mpc512x/start.S | 2 +- arch/powerpc/cpu/mpc5xx/start.S | 2 +- arch/powerpc/cpu/mpc5xxx/start.S | 2 +- arch/powerpc/cpu/mpc8220/start.S | 2 +- arch/powerpc/cpu/mpc824x/start.S | 2 +- arch/powerpc/cpu/mpc8260/start.S | 2 +- arch/powerpc/cpu/mpc83xx/start.S | 2 +- arch/powerpc/cpu/mpc85xx/start.S | 2 +- arch/powerpc/cpu/mpc86xx/start.S | 2 +- arch/powerpc/cpu/mpc8xx/start.S | 2 +- arch/powerpc/cpu/ppc4xx/start.S | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/powerpc/cpu/74xx_7xx/start.S b/arch/powerpc/cpu/74xx_7xx/start.S index ce0fa3d..7209de2 100644 --- a/arch/powerpc/cpu/74xx_7xx/start.S +++ b/arch/powerpc/cpu/74xx_7xx/start.S @@ -724,7 +724,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11 - stw r10,0(r3) + stw r4,0(r3) beq- 5f stw r0,0(r4) 5: bdnz 3b diff --git a/arch/powerpc/cpu/mpc512x/start.S b/arch/powerpc/cpu/mpc512x/start.S index 64eb657..4bef94f 100644 --- a/arch/powerpc/cpu/mpc512x/start.S +++ b/arch/powerpc/cpu/mpc512x/start.S @@ -617,7 +617,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11 - stw r10,0(r3) + stw r4,0(r3) beq- 5f stw r0,0(r4) 5: bdnz 3b diff --git a/arch/powerpc/cpu/mpc5xx/start.S b/arch/powerpc/cpu/mpc5xx/start.S index 560c706..0def169 100644 --- a/arch/powerpc/cpu/mpc5xx/start.S +++ b/arch/powerpc/cpu/mpc5xx/start.S @@ -466,7 +466,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11 - stw r10,0(r3) + stw r4,0(r3) beq- 5f stw r0,0(r4) 5: bdnz 3b diff --git a/arch/powerpc/cpu/mpc5xxx/start.S b/arch/powerpc/cpu/mpc5xxx/start.S index b8c1cb5..b593305 100644 --- a/arch/powerpc/cpu/mpc5xxx/start.S +++ b/arch/powerpc/cpu/mpc5xxx/start.S @@ -682,7 +682,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11 - stw r10,0(r3) + stw r4,0(r3) beq- 5f stw r0,0(r4) 5: bdnz 3b diff --git a/arch/powerpc/cpu/mpc8220/start.S b/arch/powerpc/cpu/mpc8220/start.S index 6b63821..7576f59 100644 --- a/arch/powerpc/cpu/mpc8220/start.S +++ b/arch/powerpc/cpu/mpc8220/start.S @@ -655,7 +655,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11 - stw r10,0(r3) + stw r4,0(r3) beq- 5f stw r0,0(r4) 5: bdnz 3b diff --git a/arch/powerpc/cpu/mpc824x/start.S b/arch/powerpc/cpu/mpc824x/start.S index a32e68b..4208f62 100644 --- a/arch/powerpc/cpu/mpc824x/start.S +++ b/arch/powerpc/cpu/mpc824x/start.S @@ -597,7 +597,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11 - stw r10,0(r3) + stw r4,0(r3) beq- 5f stw r0,0(r4) 5: bdnz 3b diff --git a/arch/powerpc/cpu/mpc8260/start.S b/arch/powerpc/cpu/mpc8260/start.S index 5c2e251..5126bbd 100644 --- a/arch/powerpc/cpu/mpc8260/start.S +++ b/arch/powerpc/cpu/mpc8260/start.S @@ -917,7 +917,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11 - stw r10,0(r3) + stw r4,0(r3) beq- 5f stw r0,0(r4) 5: bdnz 3b diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S index d3ec580..c5eae27 100644 --- a/arch/powerpc/cpu/mpc83xx/start.S +++ b/arch/powerpc/cpu/mpc83xx/start.S @@ -988,7 +988,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11 - stw r10,0(r3) + stw r4,0(r3) beq- 5f stw r0,0(r4) 5: bdnz 3b diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index 19e9735..b88851e 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -1027,7 +1027,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11 - stw r10,0(r3) + stw r4,0(r3) beq- 5f stw r0,0(r4) 5: bdnz 3b diff --git a/arch/powerpc/cpu/mpc86xx/start.S b/arch/powerpc/cpu/mpc86xx/start.S index 3f05e53..3760f40 100644 --- a/arch/powerpc/cpu/mpc86xx/start.S +++ b/arch/powerpc/cpu/mpc86xx/start.S @@ -741,7 +741,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11 - stw r10,0(r3) + stw r4,0(r3) beq- 5f stw r0,0(r4) 5: bdnz 3b diff --git a/arch/powerpc/cpu/mpc8xx/start.S b/arch/powerpc/cpu/mpc8xx/start.S index 1b729eb..1524df8 100644 --- a/arch/powerpc/cpu/mpc8xx/start.S +++ b/arch/powerpc/cpu/mpc8xx/start.S @@ -597,7 +597,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11 - stw r10,0(r3) + stw r4,0(r3) beq- 5f stw r0,0(r4) 5: bdnz 3b diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S index 27709c4..cd5b44c 100644 --- a/arch/powerpc/cpu/ppc4xx/start.S +++ b/arch/powerpc/cpu/ppc4xx/start.S @@ -1604,7 +1604,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11 - stw r10,0(r3) + stw r4,0(r3) beq- 5f stw r0,0(r4) 5: bdnz 3b
Ping?
The fixup procedure just stored a constant value in the fixup table rather than just adjusting the table. Although that doesn't seem to do any harm, it prevents relocation more that once.
Signed-off-by: Joakim Tjernlund Joakim.Tjernlund@transmode.se
arch/powerpc/cpu/74xx_7xx/start.S | 2 +- arch/powerpc/cpu/mpc512x/start.S | 2 +- arch/powerpc/cpu/mpc5xx/start.S | 2 +- arch/powerpc/cpu/mpc5xxx/start.S | 2 +- arch/powerpc/cpu/mpc8220/start.S | 2 +- arch/powerpc/cpu/mpc824x/start.S | 2 +- arch/powerpc/cpu/mpc8260/start.S | 2 +- arch/powerpc/cpu/mpc83xx/start.S | 2 +- arch/powerpc/cpu/mpc85xx/start.S | 2 +- arch/powerpc/cpu/mpc86xx/start.S | 2 +- arch/powerpc/cpu/mpc8xx/start.S | 2 +- arch/powerpc/cpu/ppc4xx/start.S | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/powerpc/cpu/74xx_7xx/start.S b/arch/powerpc/cpu/74xx_7xx/start.S index ce0fa3d..7209de2 100644 --- a/arch/powerpc/cpu/74xx_7xx/start.S +++ b/arch/powerpc/cpu/74xx_7xx/start.S @@ -724,7 +724,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11
- stw r10,0(r3)
- stw r4,0(r3) beq- 5f stw r0,0(r4)
5: bdnz 3b diff --git a/arch/powerpc/cpu/mpc512x/start.S b/arch/powerpc/cpu/mpc512x/start.S index 64eb657..4bef94f 100644 --- a/arch/powerpc/cpu/mpc512x/start.S +++ b/arch/powerpc/cpu/mpc512x/start.S @@ -617,7 +617,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11
- stw r10,0(r3)
- stw r4,0(r3) beq- 5f stw r0,0(r4)
5: bdnz 3b diff --git a/arch/powerpc/cpu/mpc5xx/start.S b/arch/powerpc/cpu/mpc5xx/start.S index 560c706..0def169 100644 --- a/arch/powerpc/cpu/mpc5xx/start.S +++ b/arch/powerpc/cpu/mpc5xx/start.S @@ -466,7 +466,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11
- stw r10,0(r3)
- stw r4,0(r3) beq- 5f stw r0,0(r4)
5: bdnz 3b diff --git a/arch/powerpc/cpu/mpc5xxx/start.S b/arch/powerpc/cpu/mpc5xxx/start.S index b8c1cb5..b593305 100644 --- a/arch/powerpc/cpu/mpc5xxx/start.S +++ b/arch/powerpc/cpu/mpc5xxx/start.S @@ -682,7 +682,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11
- stw r10,0(r3)
- stw r4,0(r3) beq- 5f stw r0,0(r4)
5: bdnz 3b diff --git a/arch/powerpc/cpu/mpc8220/start.S b/arch/powerpc/cpu/mpc8220/start.S index 6b63821..7576f59 100644 --- a/arch/powerpc/cpu/mpc8220/start.S +++ b/arch/powerpc/cpu/mpc8220/start.S @@ -655,7 +655,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11
- stw r10,0(r3)
- stw r4,0(r3) beq- 5f stw r0,0(r4)
5: bdnz 3b diff --git a/arch/powerpc/cpu/mpc824x/start.S b/arch/powerpc/cpu/mpc824x/start.S index a32e68b..4208f62 100644 --- a/arch/powerpc/cpu/mpc824x/start.S +++ b/arch/powerpc/cpu/mpc824x/start.S @@ -597,7 +597,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11
- stw r10,0(r3)
- stw r4,0(r3) beq- 5f stw r0,0(r4)
5: bdnz 3b diff --git a/arch/powerpc/cpu/mpc8260/start.S b/arch/powerpc/cpu/mpc8260/start.S index 5c2e251..5126bbd 100644 --- a/arch/powerpc/cpu/mpc8260/start.S +++ b/arch/powerpc/cpu/mpc8260/start.S @@ -917,7 +917,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11
- stw r10,0(r3)
- stw r4,0(r3) beq- 5f stw r0,0(r4)
5: bdnz 3b diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S index d3ec580..c5eae27 100644 --- a/arch/powerpc/cpu/mpc83xx/start.S +++ b/arch/powerpc/cpu/mpc83xx/start.S @@ -988,7 +988,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11
- stw r10,0(r3)
- stw r4,0(r3) beq- 5f stw r0,0(r4)
5: bdnz 3b diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index 19e9735..b88851e 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -1027,7 +1027,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11
- stw r10,0(r3)
- stw r4,0(r3) beq- 5f stw r0,0(r4)
5: bdnz 3b diff --git a/arch/powerpc/cpu/mpc86xx/start.S b/arch/powerpc/cpu/mpc86xx/start.S index 3f05e53..3760f40 100644 --- a/arch/powerpc/cpu/mpc86xx/start.S +++ b/arch/powerpc/cpu/mpc86xx/start.S @@ -741,7 +741,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11
- stw r10,0(r3)
- stw r4,0(r3) beq- 5f stw r0,0(r4)
5: bdnz 3b diff --git a/arch/powerpc/cpu/mpc8xx/start.S b/arch/powerpc/cpu/mpc8xx/start.S index 1b729eb..1524df8 100644 --- a/arch/powerpc/cpu/mpc8xx/start.S +++ b/arch/powerpc/cpu/mpc8xx/start.S @@ -597,7 +597,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11
- stw r10,0(r3)
- stw r4,0(r3) beq- 5f stw r0,0(r4)
5: bdnz 3b diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S index 27709c4..cd5b44c 100644 --- a/arch/powerpc/cpu/ppc4xx/start.S +++ b/arch/powerpc/cpu/ppc4xx/start.S @@ -1604,7 +1604,7 @@ in_ram: lwzux r0,r4,r11 cmpwi r0,0 add r0,r0,r11
- stw r10,0(r3)
- stw r4,0(r3) beq- 5f stw r0,0(r4)
5: bdnz 3b
1.7.2.2
U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Dear Joakim Tjernlund,
In message 1288893720-29915-1-git-send-email-Joakim.Tjernlund@transmode.se you wrote:
The fixup procedure just stored a constant value in the fixup table rather than just adjusting the table. Although that doesn't seem to do any harm, it prevents relocation more that once.
Signed-off-by: Joakim Tjernlund Joakim.Tjernlund@transmode.se
arch/powerpc/cpu/74xx_7xx/start.S | 2 +- arch/powerpc/cpu/mpc512x/start.S | 2 +- arch/powerpc/cpu/mpc5xx/start.S | 2 +- arch/powerpc/cpu/mpc5xxx/start.S | 2 +- arch/powerpc/cpu/mpc8220/start.S | 2 +- arch/powerpc/cpu/mpc824x/start.S | 2 +- arch/powerpc/cpu/mpc8260/start.S | 2 +- arch/powerpc/cpu/mpc83xx/start.S | 2 +- arch/powerpc/cpu/mpc85xx/start.S | 2 +- arch/powerpc/cpu/mpc86xx/start.S | 2 +- arch/powerpc/cpu/mpc8xx/start.S | 2 +- arch/powerpc/cpu/ppc4xx/start.S | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
participants (3)
-
Joakim Tjernlund -
Joakim Tjernlund
-
Wolfgang Denk