aboutsummaryrefslogtreecommitdiffstats
path: root/target/jffs2
diff options
context:
space:
mode:
authorMike Baker <mbm@openwrt.org>2005-03-04 04:35:15 +0000
committerMike Baker <mbm@openwrt.org>2005-03-04 04:35:15 +0000
commit7b295b2e9877e3ec7ef08195a17bc4a4edd47afa (patch)
tree46f4035e8c9f387e15065e96181cdf8741f9f639 /target/jffs2
parentfa4332db3ba59993185706589038c226463eb171 (diff)
downloadupstream-7b295b2e9877e3ec7ef08195a17bc4a4edd47afa.tar.gz
upstream-7b295b2e9877e3ec7ef08195a17bc4a4edd47afa.tar.bz2
upstream-7b295b2e9877e3ec7ef08195a17bc4a4edd47afa.zip
fix the jffs2 build for separate 4M/8M images
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@303 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/jffs2')
-rw-r--r--target/jffs2/blocksize.mk1
-rw-r--r--target/jffs2/jffs2root.mk10
2 files changed, 7 insertions, 4 deletions
diff --git a/target/jffs2/blocksize.mk b/target/jffs2/blocksize.mk
deleted file mode 100644
index 9e08a04974..0000000000
--- a/target/jffs2/blocksize.mk
+++ /dev/null
@@ -1 +0,0 @@
-JFFS2_BLOCK_SIZE:=0x20000
diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk
index 9846d001f0..b14f2d0f76 100644
--- a/target/jffs2/jffs2root.mk
+++ b/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