summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-13 11:32:24 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-13 11:32:24 -0800
commit5279585ff2bedc8180da5bdf8aa3ff1736466de2 (patch)
tree4f1dadd2c53df8d38d779381ecb91dfc7eb8a3a8
parent68b32d4499fd910b85b263c3afe92687d18abc3f (diff)
parent9f3eefc4f9b02404e89d624a6cd40e7b468b5fd5 (diff)
downloadblackbird-op-linux-5279585ff2bedc8180da5bdf8aa3ff1736466de2.tar.gz
blackbird-op-linux-5279585ff2bedc8180da5bdf8aa3ff1736466de2.zip
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx: powerpc/40x: Add proper BOOTCFLAGS for cuboot-acadia
-rw-r--r--arch/powerpc/boot/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 8fc6d72849ae..3d3daa674299 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -41,6 +41,7 @@ $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
$(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
+$(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
$(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
$(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
OpenPOWER on IntegriCloud