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

better support for handling various jffs2 eraseblock sizes

Browse source 
SVN-Revision: 8011
This commit is contained in:
Felix Fietkau 2007-07-16 22:06:45 +00:00
parent 1473b7b5ea
commit e8918b0f66
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
include/image.mk
View file

@ -18,6 +18,8 @@ JFFS2OPTS := --pad --big-endian --squash
SQUASHFS_OPTS := -be SQUASHFS_OPTS := -be
endif endif
JFFS2_BLOCKSIZE ?= 64k 128k
define add_jffs2_mark define add_jffs2_mark
echo -ne '\xde\xad\xc0\xde' >> $(1) echo -ne '\xde\xad\xc0\xde' >> $(1)
endef endef
@ -36,19 +38,11 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
define Image/mkfs/jffs2 define Image/mkfs/jffs2
rm -rf $(BUILD_DIR)/root/jffs rm -rf $(BUILD_DIR)/root/jffs
$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $(KDIR)/root.jffs2-64k -d $(BUILD_DIR)/root $(foreach SZ,$(JFFS2_BLOCKSIZE),\
$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $(KDIR)/root.jffs2-128k -d $(BUILD_DIR)/root $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e $(patsubst %k,%KiB,$(SZ)) -o $(KDIR)/root.jffs2-$(SZ) -d $(BUILD_DIR)/root; \
$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x40000 -o $(KDIR)/root.jffs2-256k -d $(BUILD_DIR)/root $(call add_jffs2_mark,$(KDIR)/root.jffs2-$(SZ)); \
$(call Image/Build,jffs2-$(SZ)) \
)
# add End-of-Filesystem markers
$(call add_jffs2_mark,$(KDIR)/root.jffs2-64k)
$(call add_jffs2_mark,$(KDIR)/root.jffs2-128k)
$(call add_jffs2_mark,$(KDIR)/root.jffs2-256k)
$(call Image/Build,jffs2-64k)
$(call Image/Build,jffs2-128k)
$(call Image/Build,jffs2-256k)
endef endef
endif endif

2
target/linux/amcc-2.6/image/Makefile
View file

@ -7,6 +7,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
JFFS2_BLOCKSIZE=256k
define Image/Prepare define Image/Prepare
cp $(LINUX_DIR)/arch/ppc/boot/images/uImage $(KDIR)/uImage cp $(LINUX_DIR)/arch/ppc/boot/images/uImage $(KDIR)/uImage
endef endef