aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2007-05-24 23:19:17 -0400
committerPaul Mackerras <paulus@samba.org>2007-06-02 07:01:55 -0400
commit988519acb3dbe7168276a36cbb8fd91fddbffaee (patch)
treebd801f184f63c390bb37b7f15ac149cf763d0f03
parent7d43e57764fe6922703c36d8d0d56a7ead21f03d (diff)
[POWERPC] Fix compiler/assembler flags for Ebony platform boot files
The recent addition of assembler flags for 44x.c and ebony.c in the bootwrapper to make them compile on certain toolchains was not correct and could break other platforms. This patch switches to using a compiler flag instead, which implies the appropriate assembler flag, and also stops the compiler itself generating instructions which are invalid for the platform in question. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Acked-by: Segher Boessenkool <segher@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/boot/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 83788986b93b..378bda50b178 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -33,8 +33,8 @@ endif
33 33
34BOOTCFLAGS += -I$(obj) -I$(srctree)/$(obj) 34BOOTCFLAGS += -I$(obj) -I$(srctree)/$(obj)
35 35
36$(obj)/44x.o: BOOTCFLAGS += -Wa,-mbooke 36$(obj)/44x.o: BOOTCFLAGS += -mcpu=440
37$(obj)/ebony.o: BOOTCFLAGS += -Wa,-mbooke 37$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
38 38
39zlib := inffast.c inflate.c inftrees.c 39zlib := inffast.c inflate.c inftrees.c
40zlibheader := inffast.h inffixed.h inflate.h inftrees.h infutil.h 40zlibheader := inffast.h inffixed.h inflate.h inftrees.h infutil.h