From 22ba317f5174d231be82f368381216404d4032f3 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 4 Mar 2005 04:35:15 +0000 Subject: fix the jffs2 build for separate 4M/8M images git-svn-id: svn://svn.openwrt.org/openwrt/trunk@303 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/target/jffs2/blocksize.mk | 1 - openwrt/target/jffs2/jffs2root.mk | 10 +++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 openwrt/target/jffs2/blocksize.mk (limited to 'openwrt/target/jffs2') diff --git a/openwrt/target/jffs2/blocksize.mk b/openwrt/target/jffs2/blocksize.mk deleted file mode 100644 index 9e08a0497..000000000 --- a/openwrt/target/jffs2/blocksize.mk +++ /dev/null @@ -1 +0,0 @@ -JFFS2_BLOCK_SIZE:=0x20000 diff --git a/openwrt/target/jffs2/jffs2root.mk b/openwrt/target/jffs2/jffs2root.mk index 9846d001f..b14f2d0f7 100644 --- a/openwrt/target/jffs2/jffs2root.mk +++ b/openwrt/target/jffs2/jffs2root.mk @@ -4,8 +4,6 @@ # ############################################################# -include target/jffs2/blocksize.mk - MTD_DIR:=$(BUILD_DIR)/mtd-20050122.orig MTD_SOURCE=mtd_20050122.orig.tar.gz MTD_SITE=http://ftp.debian.org/debian/pool/main/m/mtd @@ -46,6 +44,12 @@ jffs2root-dirclean: rm -rf $(MTD_DIR) ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y) -TARGETS+=jffs2root openwrt-image +TARGETS+=openwrt-image ROOTFS=jffs2 + +openwrt-image: openwrt + @make jffs2root openwrt-code.bin TAG=W54G \ + EXTRAVERSION=$(EXTRAVERSION)-JFFS2-4M JFFS2_BLOCK_SIZE=0x10000 + @make jffs2root openwrt-code.bin TAG=W54S \ + EXTRAVERSION=$(EXTRAVERSION)-JFFS2-8M JFFS2_BLOCK_SIZE=0x20000 endif -- cgit v1.2.3