KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleanup image generation

Browse source 
SVN-Revision: 22829
This commit is contained in:
Lars-Peter Clausen 2010-08-28 22:01:21 +00:00
parent 1d6f21de61
commit 28d7de48b8
1 changed files with 4 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
target/linux/kirkwood/image/Makefile
View file

@ -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