X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/02c9cd23690727767b933f700a10296d18b47a84..ecb4c97c2046acb93107e86f48bdc7d1c328b06a:/target/linux/adm5120/image/Makefile

diff --git a/target/linux/adm5120/image/Makefile b/target/linux/adm5120/image/Makefile
index ea13017b1..710e82be5 100644
--- a/target/linux/adm5120/image/Makefile
+++ b/target/linux/adm5120/image/Makefile
@@ -9,9 +9,10 @@ include $(INCLUDE_DIR)/image.mk
 
 LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR)
 IMGNAME := $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)
+JFFS2EOF := $(KDIR)/jffs2.eof
 
 define imgname
-$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(patsubst jffs2-%,jffs2,$(1))-$(2)
+$(IMGNAME)-$(2)-$(patsubst jffs2-%,jffs2,$(1))
 endef
 
 define Build/Clean
@@ -20,6 +21,9 @@ endef
 
 define Image/Prepare
 	cat $(KDIR)/vmlinux | $(STAGING_DIR_HOST)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
+	rm -f $(JFFS2EOF)
+	touch $(JFFS2EOF)
+	$(call prepare_generic_squashfs,$(JFFS2EOF))
 endef
 
 define Image/Build/Loader
@@ -31,7 +35,7 @@ endef
 
 define Image/Build/LZMAKernel
 	$(LOADER_MAKE) TARGET_DIR=$(BIN_DIR) \
-		LOADER=openwrt-$(BOARD)-$(KERNEL)-ramfs-lzma-$(1).$(2) \
+		LOADER=openwrt-$(BOARD)-$(KERNEL)-$(1)-ramfs.$(2) \
 		LOADER_DATA=$(KDIR)/vmlinux.lzma \
 		LZMA_TEXT_START=$(3) LZMA_STARTUP_ORG=$(4) \
 		CONFIG_PASS_KARGS=$(5) CONFIG_BOARD=$(6) \
@@ -53,11 +57,13 @@ endef
 define trxalign/jffs2-128k
 -a 0x20000 -f $(KDIR)/root.jffs2-128k
 endef
+
 define trxalign/jffs2-64k
 -a 0x10000 -f $(KDIR)/root.jffs2-64k
 endef
+
 define trxalign/squashfs
--a 1024 -f $(KDIR)/root.squashfs
+-a 1024 -f $(KDIR)/root.squashfs -a 0x10000 -A $(JFFS2EOF)
 endef
 
 define Image/Build/TRX