summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-09-21 17:13:51 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-09-21 17:13:51 +0000
commit747262510678320666ca9fbf41e89f1968ae1902 (patch)
tree9c470c5d2dffb819bf1b43fd640d13ab2b5d6c41
parentf08be3e501d20838b7467f26a86dfc40ee9efcae (diff)
[adm5120] use prepare_generic_squashfs in image generation, thanks ffrrrr
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8922 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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