ソースを参照

add support for jffs2 filesystems with 256k blocksize, fix taishan support

SVN-Revision: 7506
Imre Kaloz 18 年 前
コミット
72823077cd
3 ファイル変更11 行追加1 行削除
  1. 3 0
      include/image.mk
  2. 1 1
      target/linux/amcc-2.6/Makefile
  3. 7 0
      target/linux/amcc-2.6/image/Makefile

+ 3 - 0
include/image.mk

@@ -38,14 +38,17 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
 		
 		$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $(KDIR)/root.jffs2-64k -d $(BUILD_DIR)/root
 		$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $(KDIR)/root.jffs2-128k -d $(BUILD_DIR)/root
+		$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x40000 -o $(KDIR)/root.jffs2-256k -d $(BUILD_DIR)/root
 
 		
 		# 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
   endif
     

+ 1 - 1
target/linux/amcc-2.6/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=powerpc
 BOARD:=amcc
 BOARDNAME:=AMCC Taishan
-FEATURES:=squashfs broken
+FEATURES:=jffs2
 
 define Target/Description
 	Build firmware images for the AMCC Taishan evaluation board

+ 7 - 0
target/linux/amcc-2.6/image/Makefile

@@ -19,6 +19,13 @@ define Image/Build
 	$(call Image/Build/$(1),$(1))
 endef
 
+define Image/Build/jffs2-256k
+	( \
+		dd if=$(LINUX_DIR)/arch/ppc/boot/images/uImage bs=4096k conv=sync; \
+		dd if=$(KDIR)/root.$(1) bs=256k conv=sync; \
+	) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-jffs2.img
+endef
+
 define Image/Build/squashfs
 	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
 	( \