aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2007-09-21 17:13:51 +0000
committerGabor Juhos <juhosg@openwrt.org>2007-09-21 17:13:51 +0000
commit433bb695f9dbcbd2f7ca2829629881d64fa84ef3 (patch)
tree47a5545e1f7103f9ddc9c645e7bc79de8961dec4
parentdd44ecc578864e11559152643f1a56dce84e0cb1 (diff)
downloadupstream-433bb695f9dbcbd2f7ca2829629881d64fa84ef3.tar.gz
upstream-433bb695f9dbcbd2f7ca2829629881d64fa84ef3.tar.bz2
upstream-433bb695f9dbcbd2f7ca2829629881d64fa84ef3.zip
use prepare_generic_squashfs in image generation, thanks ffrrrr
SVN-Revision: 8922
-rw-r--r--target/linux/adm5120/image/Makefile10
1 files changed, 8 insertions, 2 deletions
diff --git a/target/linux/adm5120/image/Makefile b/target/linux/adm5120/image/Makefile
index ea13017b12..ba3dd38f7e 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)-$(patsubst jffs2-%,jffs2,$(1))-$(2)
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
@@ -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