target/rb532: fix broken yaffs image creation

diff --git a/target/linux/generic/image/lzma-loader/Makefile b/target/linux/generic/image/lzma-loader/Makefile
index d75a4468b0b40617667413c695bc1f847a3c2f00..a87df8559504db21460a58e0c077b6790671e0e6 100644 (file)
--- a/target/linux/generic/image/lzma-loader/Makefile
+++ b/target/linux/generic/image/lzma-loader/Makefile
@@ -26,7 +26,7 @@ $(PKG_BUILD_DIR)/lzma.elf: $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/vmlinux.l
                IMAGE_COPY=$(IMAGE_COPY)
 
 
-$(PKG_BUILD_DIR)/vmlinux.lzma: $(KDIR)/vmlinux.lzma
+$(PKG_BUILD_DIR)/vmlinux.lzma: $(KDIR)/vmlinux$(LOADER_TYPE).lzma
        $(CP) $< $@
 
 $(KDIR)/loader$(LOADER_TYPE).elf: $(PKG_BUILD_DIR)/lzma.elf
@@ -35,12 +35,13 @@ $(KDIR)/loader$(LOADER_TYPE).elf: $(PKG_BUILD_DIR)/lzma.elf
 $(KDIR)/loader$(LOADER_TYPE).bin: $(PKG_BUILD_DIR)/lzma.bin
        $(CP) $< $@
 
+
 download: 
 prepare: $(PKG_BUILD_DIR)/.prepared
-compile: $(KDIR)/loader$(LOADER_TYPE).elf $(KDIR)/loader$(LOADER_TYPE).bin
+compile: $(KDIR)/loader$(LOADER_TYPE).elf  $(KDIR)/loader$(LOADER_TYPE).bin
 install:
 
 clean:
        rm -rf $(PKG_BUILD_DIR)
-       rm -f $(KDIR)/loader.elf
-       rm -f $(KDIR)/loader.bin
+       rm -f $(KDIR)/loader$(LOADER_TYPE).elf
+       rm -f $(KDIR)/loader$(LOADER_TYPE).bin

diff --git a/target/linux/rb532/image/Makefile b/target/linux/rb532/image/Makefile
index 1a1f3437796eeb7b1002d0eeaef4c8e5d20ebd84..854c92e2b2eea29372b602a95c95c2252da53f78 100644 (file)
--- a/target/linux/rb532/image/Makefile
+++ b/target/linux/rb532/image/Makefile
@@ -27,19 +27,20 @@ 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)) '
+       $(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux.elf '$(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
+       $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader $(LOADER_MAKEOPTS) LOADER_TYPE="-initramfs" clean compile
 endif
 endef
 
-VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux-kernel
+VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux
 
 define Image/BuildKernel
-       $(CP) $(KDIR)/loader.elf $(VMLINUX)
+       $(CP) $(KDIR)/vmlinux.elf $(VMLINUX).elf
+       $(CP) $(KDIR)/loader.elf $(VMLINUX)-lzma.elf
 ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
-       $(CP) $(KDIR)/loader-initramfs.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux-initramfs
+       $(CP) $(KDIR)/loader-initramfs.elf $(VMLINUX)-initramfs-lzma.elf
+       $(CP) $(KDIR)/vmlinux-initramfs.elf $(VMLINUX)-initramfs.elf
 endif
 endef