From: John Crispin <john@openwrt.org>
Date: Thu, 25 Jul 2013 20:29:10 +0000 (+0000)
Subject: lantiq: fix initramfs image generation for lzmaloader based images
X-Git-Tag: reboot~9698
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=313636c1e4b642016b5f8bb99cb2e4c01bb4e8ff

lantiq: fix initramfs image generation for lzmaloader based images

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 37540
---

diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile
index 20840cad82..b9b410b38e 100644
--- a/target/linux/lantiq/image/Makefile
+++ b/target/linux/lantiq/image/Makefile
@@ -18,11 +18,11 @@ LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR)
 
 define Image/BuildLoader/Template
 	-rm -rf $(KDIR)/lzma-loader
-	$(LOADER_MAKE) LOADER=loader-$(1).$(2)\
+	$(LOADER_MAKE) LOADER=loader$(2)-$(1).bin\
 		LZMA_TEXT_START=0x80a00000 \
 		LOADADDR=0x80002000 \
-		LOADER_DATA="$(KDIR)/vmlinux-$(1).lzma" BOARD="$(1)" \
-		compile loader.$(2)
+		LOADER_DATA="$(KDIR)/vmlinux$(2)-$(1).lzma" BOARD="$(1)" \
+		compile loader.bin
 endef
 
 
@@ -120,9 +120,15 @@ endef
 
 define Image/BuildKernelLoader/Template
 	$(call PatchKernelLzma,$(1))
-	$(call Image/BuildLoader/Template,$(1),bin)
+	$(call Image/BuildLoader/Template,$(1))
 	$(CP) $(KDIR)/loader-$(1).bin $(BIN_DIR)/$(IMG_PREFIX)-$(1)-vmlinux-loader
 	$(CP) $(KDIR)/vmlinux-$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1)-vmlinux
+ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
+	$(call PatchKernelLzma,$(1),-initramfs)
+	$(call Image/BuildLoader/Template,$(1),-initramfs)
+	$(CP) $(KDIR)/loader-initramfs-$(1).bin $(BIN_DIR)/$(IMG_PREFIX)-$(1)-vmlinux-initramfs-loader
+	$(CP) $(KDIR)/vmlinux-initramfs-$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1)-vmlinux-initramfs
+endif
 endef
 
 define Image/BuildKernelEVA/Template