diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2007-11-03 14:53:24 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2007-11-03 14:53:24 +0000 |
commit | 7beed534039f364b064e2eb87432d3f1fec95e37 (patch) | |
tree | 02e70cfb61825df27daf585cdc8008f0c7c9efc3 /target/linux/adm5120/image/Makefile | |
parent | 5d901efb9e21bb3e60f2e43c7512e5ac2b54c755 (diff) | |
download | upstream-7beed534039f364b064e2eb87432d3f1fec95e37.tar.gz upstream-7beed534039f364b064e2eb87432d3f1fec95e37.tar.bz2 upstream-7beed534039f364b064e2eb87432d3f1fec95e37.zip |
image generation fixes (closes: #2643, #2644) * rewrite mkcsysimg to use an align parameter instead of a fixed size * Edimax images contains the jffs2 end-of-filesystem marker at the right position from now on
SVN-Revision: 9490
Diffstat (limited to 'target/linux/adm5120/image/Makefile')
-rw-r--r-- | target/linux/adm5120/image/Makefile | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/target/linux/adm5120/image/Makefile b/target/linux/adm5120/image/Makefile index 710e82be5c..ee8cf42ea8 100644 --- a/target/linux/adm5120/image/Makefile +++ b/target/linux/adm5120/image/Makefile @@ -9,7 +9,8 @@ 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 +JFFS2BLOCK := $(KDIR)/jffs2.block +JFFS2MARK := $(KDIR)/jffs2.mark define imgname $(IMGNAME)-$(2)-$(patsubst jffs2-%,jffs2,$(1)) @@ -21,9 +22,12 @@ 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)) + rm -f $(JFFS2BLOCK) + touch $(JFFS2BLOCK) + $(call prepare_generic_squashfs,$(JFFS2BLOCK)) + rm -f $(JFFS2MARK) + touch $(JFFS2MARK) + $(call add_jffs2_mark,$(JFFS2MARK)) endef define Image/Build/Loader @@ -63,7 +67,7 @@ define trxalign/jffs2-64k endef define trxalign/squashfs --a 1024 -f $(KDIR)/root.squashfs -a 0x10000 -A $(JFFS2EOF) +-a 1024 -f $(KDIR)/root.squashfs -a 0x10000 -A $(JFFS2BLOCK) endef define Image/Build/TRX |