diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2007-06-05 20:55:21 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2007-06-05 20:55:21 +0000 |
| commit | 72823077cdabdb6b3432a254d413000d00630634 (patch) | |
| tree | 066601b192a8c03efa0c1f613b7a98f12648b9b1 | |
| parent | 40f74f411d890de64200dfe8eaffb1332e7cc2e6 (diff) | |
| download | upstream-72823077cdabdb6b3432a254d413000d00630634.tar.gz upstream-72823077cdabdb6b3432a254d413000d00630634.tar.bz2 upstream-72823077cdabdb6b3432a254d413000d00630634.zip | |
add support for jffs2 filesystems with 256k blocksize, fix taishan support
SVN-Revision: 7506
| -rw-r--r-- | include/image.mk | 3 | ||||
| -rw-r--r-- | target/linux/amcc-2.6/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/amcc-2.6/image/Makefile | 7 |
3 files changed, 11 insertions, 1 deletions
diff --git a/include/image.mk b/include/image.mk index 815f01ba02..08f240fe23 100644 --- a/include/image.mk +++ b/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 diff --git a/target/linux/amcc-2.6/Makefile b/target/linux/amcc-2.6/Makefile index 935e639a53..58d739df10 100644 --- a/target/linux/amcc-2.6/Makefile +++ b/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 diff --git a/target/linux/amcc-2.6/image/Makefile b/target/linux/amcc-2.6/image/Makefile index bab2e647ee..bd391f02f2 100644 --- a/target/linux/amcc-2.6/image/Makefile +++ b/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) ( \ |