summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/cpu/ppc4xx
diff options
context:
space:
mode:
authorH. Nikolaus Schaller <hns@goldelico.com>2010-11-26 17:45:13 +0100
committerH. Nikolaus Schaller <hns@goldelico.com>2010-11-26 17:45:13 +0100
commitf003cc258976f2a46226ad8a3ef01cedb356079e (patch)
treedf0250b47098e2cd148fafecd1430f1cc5031892 /arch/powerpc/cpu/ppc4xx
parent60d2fab5fa5130175223eff2dc4be5a4f6fe9b03 (diff)
parentc70e7ddb7e15e768d79edcbc4322d735e65ec31f (diff)
downloadbootable_bootloader_goldelico_gta04-f003cc258976f2a46226ad8a3ef01cedb356079e.zip
bootable_bootloader_goldelico_gta04-f003cc258976f2a46226ad8a3ef01cedb356079e.tar.gz
bootable_bootloader_goldelico_gta04-f003cc258976f2a46226ad8a3ef01cedb356079e.tar.bz2
git pull denx master; fixed compilation issues
Diffstat (limited to 'arch/powerpc/cpu/ppc4xx')
-rw-r--r--arch/powerpc/cpu/ppc4xx/Makefile4
-rw-r--r--arch/powerpc/cpu/ppc4xx/start.S2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/cpu/ppc4xx/Makefile b/arch/powerpc/cpu/ppc4xx/Makefile
index fa8d10c..129a61e 100644
--- a/arch/powerpc/cpu/ppc4xx/Makefile
+++ b/arch/powerpc/cpu/ppc4xx/Makefile
@@ -23,7 +23,7 @@
include $(TOPDIR)/config.mk
-LIB = $(obj)lib$(CPU).a
+LIB = $(obj)lib$(CPU).o
START := resetvec.o
START += start.o
@@ -82,7 +82,7 @@ START := $(addprefix $(obj),$(START))
all: $(obj).depend $(START) $(LIB)
$(LIB): $(OBJS)
- $(AR) $(ARFLAGS) $@ $(OBJS)
+ $(call cmd_link_o_target, $(OBJS))
#########################################################################
diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S
index 363becc..65195f5 100644
--- a/arch/powerpc/cpu/ppc4xx/start.S
+++ b/arch/powerpc/cpu/ppc4xx/start.S
@@ -1611,7 +1611,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