[kernel] bump to 2.6.29.6 and refresh patches

[openwrt.git] / target / linux / ppc44x / image / Makefile

diff --git a/target/linux/ppc44x/image/Makefile b/target/linux/ppc44x/image/Makefile
index bd284eb..b8d5e95 100644 (file)
--- a/target/linux/ppc44x/image/Makefile
+++ b/target/linux/ppc44x/image/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,7 +10,8 @@ include $(INCLUDE_DIR)/image.mk
 JFFS2_BLOCKSIZE=256k
 
 define Image/Prepare
-       cp $(LINUX_DIR)/arch/ppc/boot/images/uImage $(KDIR)/uImage
+       cp $(LINUX_DIR)/arch/powerpc/boot/cuImage.taishan $(KDIR)/uImage
+               dtc -O dtb -R 4 -S 0x20000 $(LINUX_DIR)/arch/powerpc/boot/dts/canyonlands.dts > $(KDIR)/openwrt-canyonlands.dtb
 endef
 
 define Image/BuildKernel
@@ -23,7 +24,7 @@ endef
 
 define Image/Build/jffs2-256k
        ( \
-               dd if=$(LINUX_DIR)/arch/ppc/boot/images/uImage bs=4096k conv=sync; \
+               dd if=$(KDIR)/uImage bs=2048k conv=sync; \
                dd if=$(KDIR)/root.$(1) bs=256k conv=sync; \
        ) > $(BIN_DIR)/openwrt-$(BOARD)-jffs2.img
 endef
@@ -31,9 +32,14 @@ endef
 define Image/Build/squashfs
        $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
        ( \
-               dd if=$(LINUX_DIR)/arch/ppc/boot/images/uImage bs=4096k conv=sync; \
+               dd if=$(KDIR)/uImage bs=2048k conv=sync; \
+               dd if=$(KDIR)/root.$(1) bs=256k conv=sync; \
+       ) > $(BIN_DIR)/openwrt-$(BOARD)-taishan-$(1).img
+       ( \
+               dd if=$(LINUX_DIR)/arch/powerpc/boot/uImage bs=1920k conv=sync; \
+               dd if=$(KDIR)/openwrt-canyonlands.dtb bs=128k conv=sync; \
                dd if=$(KDIR)/root.$(1) bs=256k conv=sync; \
-       ) > $(BIN_DIR)/openwrt-$(BOARD)-$(1).img
+       ) > $(BIN_DIR)/openwrt-$(BOARD)-canyonlands-$(1).img
 endef
 
 $(eval $(call BuildImage))