From 6bbb5272ad7e689e02511677388c9516d1681ef8 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Thu, 26 Sep 2013 19:16:19 +0000 Subject: rb532: fix initramfs image creation (#14215) Signed-off-by: Florian Fainelli SVN-Revision: 38219 --- target/linux/rb532/image/Makefile | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'target') diff --git a/target/linux/rb532/image/Makefile b/target/linux/rb532/image/Makefile index 5f421bbe28..c5b756cbe7 100644 --- a/target/linux/rb532/image/Makefile +++ b/target/linux/rb532/image/Makefile @@ -26,14 +26,20 @@ endef define Image/Prepare cat $(KDIR)/vmlinux | $(STAGING_DIR_HOST)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader $(LOADER_MAKEOPTS) clean compile +ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) + $(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux-initramfs '$(strip $(call Image/cmdline/yaffs2)) ' + cat $(KDIR)/vmlinux-initramfs | $(STAGING_DIR_HOST)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux-initramfs.lzma + $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader $(LOADER_MAKEOPTS) clean compile + $(CP) $(KDIR)/loader.elf $(KDIR)/loader-initramfs.elf +endif endef VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux-kernel define Image/BuildKernel $(CP) $(KDIR)/loader.elf $(VMLINUX) -ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) - $(CP) $(KDIR)/loader.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux-initramfs +ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) + $(CP) $(KDIR)/loader-initramfs.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux-initramfs endif endef @@ -63,13 +69,4 @@ define Image/Build ./gen_image.sh $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).bin 4 $(BIN_DIR)/$(IMG_PREFIX)-$(1).kernel $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) endef -ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) - define Image/Prepare - $(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux-initramfs '$(strip $(call Image/cmdline/yaffs2)) ' - cat $(KDIR)/vmlinux-initramfs | $(STAGING_DIR_HOST)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux-initramfs.lzma - $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader $(LOADER_MAKEOPTS) clean compile - $(CP) $(KDIR)/loader.elf $(KDIR)/loader-initramfs.elf - endef -endif - $(eval $(call BuildImage)) -- cgit v1.2.3