aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2013-06-29 08:41:03 +0000
committerJohn Crispin <blogic@openwrt.org>2013-06-29 08:41:03 +0000
commite9e6f6e105b3590f82cb16b014fec4af8ea79690 (patch)
tree17c05bc7471cff34f1a0b68f35399a3f9c7a71ed /target/linux
parent1bd081cf6f48ebabe7ee9fb0c39954861eaedb3a (diff)
downloadupstream-e9e6f6e105b3590f82cb16b014fec4af8ea79690.tar.gz
upstream-e9e6f6e105b3590f82cb16b014fec4af8ea79690.tar.bz2
upstream-e9e6f6e105b3590f82cb16b014fec4af8ea79690.zip
ramips: unbreak initramfs generation
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37080 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ramips/image/Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
index 49394692f0..499f105acd 100644
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -74,15 +74,15 @@ define MkImageSysupgrade/squashfs
endef
define PatchKernelLzmaDtb
- cp $(KDIR)/vmlinux $(KDIR)/vmlinux-$(1)
+ cp $(KDIR)/vmlinux$(3) $(KDIR)/vmlinux-$(1)$(3)
$(LINUX_DIR)/scripts/dtc/dtc -O dtb -o $(KDIR)/$(2).dtb ../dts/$(2).dts
- $(STAGING_DIR_HOST)/bin/patch-dtb $(KDIR)/vmlinux-$(1) $(KDIR)/$(2).dtb
- $(call CompressLzma,$(KDIR)/vmlinux-$(1),$(KDIR)/vmlinux-$(1).bin.lzma)
+ $(STAGING_DIR_HOST)/bin/patch-dtb $(KDIR)/vmlinux-$(1)$(3) $(KDIR)/$(2).dtb
+ $(call CompressLzma,$(KDIR)/vmlinux-$(1)$(3),$(KDIR)/vmlinux-$(1)$(3).bin.lzma)
endef
define MkImageLzmaDtb
- $(call PatchKernelLzmaDtb,$(1),$(2))
- $(call MkImage,lzma,$(KDIR)/vmlinux-$(1).bin.lzma,$(KDIR)/vmlinux-$(1).uImage,$(3))
+ $(call PatchKernelLzmaDtb,$(1),$(2),$(4))
+ $(call MkImage,lzma,$(KDIR)/vmlinux-$(1)$(4).bin.lzma,$(KDIR)/vmlinux-$(1)$(4).uImage,$(3))
endef
define BuildFirmware/OF
@@ -91,8 +91,8 @@ define BuildFirmware/OF
endef
define BuildFirmware/OF/initramfs
- $(call MkImageLzmaDtb,$(2),$(3),$(4))
- $(CP) $(KDIR)/vmlinux-$(2).uImage $(call imgname,$(1),$(2))-uImage.bin
+ $(call MkImageLzmaDtb,$(2),$(3),$(4),-initramfs)
+ $(CP) $(KDIR)/vmlinux-$(2)-initramfs.uImage $(call imgname,$(1),$(2))-uImage.bin
endef