diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-08-28 22:01:21 +0000 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-08-28 22:01:21 +0000 |
| commit | 324a2cedd382a542391a01b2092686b0befbbf6a (patch) | |
| tree | a3d1498a762e57e8744f060a9f37d4b72caea357 /target/linux/kirkwood/image | |
| parent | ffb79f6fbd0319efb78c0ec45293bfc30ce75c64 (diff) | |
| download | master-187ad058-324a2cedd382a542391a01b2092686b0befbbf6a.tar.gz master-187ad058-324a2cedd382a542391a01b2092686b0befbbf6a.tar.bz2 master-187ad058-324a2cedd382a542391a01b2092686b0befbbf6a.zip | |
[kirkwood] Cleanup image generation
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22829 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/kirkwood/image')
| -rw-r--r-- | target/linux/kirkwood/image/Makefile | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index 0989d35f0a..ee29a95b6c 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -9,24 +9,6 @@ include $(INCLUDE_DIR)/image.mk JFFS2OPTS_NAND += --little-endian --pagesize=0x800 --no-cleanmarkers --pad -define Image/mkfs/jffs2/sub/sub - $(STAGING_DIR_HOST)/bin/mkfs.jffs2 $(3) \ - -e $(patsubst %k,%KiB,$(1)) -o $(KDIR)/root.jffs2-$(1)-$(2) -d $(TARGET_DIR) -v 2>&1 1>/dev/null | awk '/^.+$$$$/' -endef - -define Image/mkfs/jffs2/sub - # Do not remov this line - $(call Image/mkfs/jffs2/sub/sub,$(1),nor,$(JFFS2OPTS)) - ( \ - dd if=$(KDIR)/uImage bs=4096k conv=sync; \ - dd if=$(KDIR)/root.jffs2-$(1)-nor bs=128k conv=sync; \ - ) > $(BIN_DIR)/$(IMG_PREFIX)-jffs2-$(1)-nor.img - - $(call Image/mkfs/jffs2/sub/sub,$(1),nand,$(JFFS2OPTS) $(JFFS2OPTS_NAND)) - $(call add_jffs2_mark,$(KDIR)/root.jffs2-$(1)-nand) - cp $(KDIR)/root.jffs2-$(1)-nand $(BIN_DIR)/$(IMG_PREFIX)-jffs2-$(1)-nand.img -endef - define Image/Prepare cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage endef @@ -37,16 +19,10 @@ define Image/BuildKernel endef define Image/Build - $(call Image/Build/$(1),$(1)) -endef - -define Image/Build/jffs2-128k - ( \ - dd if=$(KDIR)/uImage bs=4096k conv=sync; \ - dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \ - ) > $(BIN_DIR)/$(IMG_PREFIX)-$(1)-nor.img - - cp $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1)-nand.img + $(if $(Image/Build/$(1)), \ + $(call Image/Build/$(1),$(1)), \ + $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1).img \ + ) endef define Image/Build/squashfs |