aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-07-01 15:37:25 +0000
committerFlorian Fainelli <florian@openwrt.org>2013-07-01 15:37:25 +0000
commit460233fa2a32ff7b2bf8bc4acfc5613923597b6b (patch)
treeb2476f7bd72aaab17f1b711074510b63baf084b5
parent4a86a26650a77b8d9bf89eb12a399ac05e074540 (diff)
downloadupstream-460233fa2a32ff7b2bf8bc4acfc5613923597b6b.tar.gz
upstream-460233fa2a32ff7b2bf8bc4acfc5613923597b6b.tar.bz2
upstream-460233fa2a32ff7b2bf8bc4acfc5613923597b6b.zip
ar71xx: fix initramfs images generation after r37049
Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 37120
-rw-r--r--target/linux/ar71xx/image/Makefile40
1 files changed, 26 insertions, 14 deletions
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 84a378382d..22b6f729f4 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -64,15 +64,15 @@ define CompressLzma
endef
define PatchKernelLzma
- cp $(KDIR)/vmlinux $(KDIR_TMP)/vmlinux-$(1)
- $(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR_TMP)/vmlinux-$(1) "$(strip $(2))"
- $(call CompressLzma,$(KDIR_TMP)/vmlinux-$(1),$(KDIR_TMP)/vmlinux-$(1).bin.lzma,$(3))
+ cp $(KDIR)/vmlinux$(4) $(KDIR_TMP)/vmlinux$(4)-$(1)
+ $(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR_TMP)/vmlinux$(4)-$(1) "$(strip $(2))"
+ $(call CompressLzma,$(KDIR_TMP)/vmlinux$(4)-$(1),$(KDIR_TMP)/vmlinux$(4)-$(1).bin.lzma,$(3))
endef
define PatchKernelGzip
- cp $(KDIR)/vmlinux $(KDIR_TMP)/vmlinux-$(1)
- $(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR_TMP)/vmlinux-$(1) "$(strip $(2))"
- gzip -9 -c $(KDIR_TMP)/vmlinux-$(1) > $(KDIR_TMP)/vmlinux-$(1).bin.gz
+ cp $(KDIR)/vmlinux$(3) $(KDIR_TMP)/vmlinux$(3)-$(1)
+ $(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR_TMP)/vmlinux$(3)-$(1) "$(strip $(2))"
+ gzip -9 -c $(KDIR_TMP)/vmlinux$(3)-$(1) > $(KDIR_TMP)/vmlinux$(3)-$(1).bin.gz
endef
define MkuImage
@@ -87,8 +87,8 @@ define MkuImageLzma
endef
define MkuImageLzma/initramfs
- $(call PatchKernelLzma,$(1),$(2))
- $(call MkuImage,lzma,,$(KDIR_TMP)/vmlinux-$(1).bin.lzma,$(call imgname,initramfs,$(1))-uImage.bin)
+ $(call PatchKernelLzma,$(1),$(2),,-initramfs)
+ $(call MkuImage,lzma,,$(KDIR_TMP)/vmlinux-initramfs-$(1).bin.lzma,$(call imgname,initramfs,$(1))-uImage.bin)
endef
define MkuImageGzip
@@ -97,8 +97,8 @@ define MkuImageGzip
endef
define MkuImageGzip/initramfs
- $(call PatchKernelGzip,$(1),$(2))
- $(call MkuImage,gzip,,$(KDIR_TMP)/vmlinux-$(1).bin.gz,$(call imgname,initramfs,$(1))-uImage.bin)
+ $(call PatchKernelGzip,$(1),$(2),-initramfs)
+ $(call MkuImage,gzip,,$(KDIR_TMP)/vmlinux-initramfs-$(1).bin.gz,$(call imgname,initramfs,$(1))-uImage.bin)
endef
define MkuImageOKLI
@@ -758,10 +758,6 @@ define Image/Build/Zcomax/initramfs
$(call MkuImageLzma/initramfs,$(2),$(3) $(4))
endef
-define Image/Build/Template/initramfs/initramfs
- $(call Image/Build/$(1)/initramfs,initramfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
-endef
-
define Image/Build/Template/all/squashfs
$(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef
@@ -826,6 +822,22 @@ define Image/Build/Template/256k/jffs2-256k
$(call Image/Build/$(1),jffs2-256k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef
+define Image/Build/Template/64k/initramfs
+ $(call Image/Build/$(1)/initramfs,initramfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
+endef
+
+define Image/Build/Template/64kraw/initramfs
+ $(call Image/Build/$(1)/initramfs,initramfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
+endef
+
+define Image/Build/Template/128k/initramfs
+ $(call Image/Build/$(1)/initramfs,initramfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
+endef
+
+define Image/Build/Template/256k/initramfs
+ $(call Image/Build/$(1)/initramfs,initramfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
+endef
+
$(eval $(call SingleProfile,ALFA,$(fs_64k),ALFANX,alfa-nx,ALFA-NX,ttyS0,115200,$$(alfa_mtdlayout_8M),1638400,6291456,vmlinux.gz.uImage,pb9x-2.6.31-jffs2))
$(eval $(call SingleProfile,ALFA,$(fs_64k),HORNETUB,hornet-ub,HORNET-UB,ttyATH0,115200,$$(alfa_mtdlayout_8M),1638400,6291456,kernel_image,rootfs_image))