summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorOlivier Dufour2013-02-05 10:31:49 +0100
committerCyril Jourdan2013-02-11 13:22:43 +0100
commit920b5cc7cb90b3f0412c601c976d3b40e7c29448 (patch)
treedd6dc093eeb5d4cb3e5449d996ffc339f4301c45 /common
parent2d8d81f9465dde77670398379fe6a5b2155bab56 (diff)
common/tools/flashfs: use generic rule to build flashfs, refs #3745
This step prepares the support of polux flashfs.
Diffstat (limited to 'common')
-rw-r--r--common/tools/flashfs/.gitignore2
-rwxr-xr-xcommon/tools/flashfs/Makefile24
-rw-r--r--common/tools/flashfs/image_500/bin/NOPRUNE (renamed from common/tools/flashfs/image/bin/NOPRUNE)0
-rw-r--r--common/tools/flashfs/image_500/etc/NOPRUNE (renamed from common/tools/flashfs/image/etc/NOPRUNE)0
-rw-r--r--common/tools/flashfs/image_500/etc/init.d/NOPRUNE (renamed from common/tools/flashfs/image/etc/init.d/NOPRUNE)0
-rw-r--r--common/tools/flashfs/image_500/etc/network/NOPRUNE (renamed from common/tools/flashfs/image/etc/network/NOPRUNE)0
-rw-r--r--common/tools/flashfs/image_500/etc/plcdrv.conf (renamed from common/tools/flashfs/image/etc/plcdrv.conf)0
-rw-r--r--common/tools/flashfs/image_500/lib/modules/NOPRUNE (renamed from common/tools/flashfs/image/lib/modules/NOPRUNE)0
8 files changed, 12 insertions, 14 deletions
diff --git a/common/tools/flashfs/.gitignore b/common/tools/flashfs/.gitignore
index f1e12b42e5..c60a7cd4c2 100644
--- a/common/tools/flashfs/.gitignore
+++ b/common/tools/flashfs/.gitignore
@@ -1 +1 @@
-/flashfs.jffs2
+/flashfs.500.jffs2
diff --git a/common/tools/flashfs/Makefile b/common/tools/flashfs/Makefile
index a6c34cd2cc..3d3752aae0 100755
--- a/common/tools/flashfs/Makefile
+++ b/common/tools/flashfs/Makefile
@@ -4,27 +4,25 @@ BLOCK_SIZE= 65536 #for spansion S29GL064A10
# FLASHDISK_SIZE : Size of your flash file system
# it must be more than 512KB (524288B)
# and at least 5 x (size of a block)
-#FLASHDISK_SIZE = 524288
-FLASHDISK_SIZE = 1048576
-
-
+FLASHDISK_SIZE_500 = 1048576
DIR=$(CURDIR)
-IMAGE = $(DIR)/image
+FLASHFS_BIN = mkfs.jffs2
+IMAGE_500 = $(DIR)/image_500
TMP_IMAGE = /tmp/fimage
-FLASHDISK = $(DIR)/flashfs.jffs2
+FLASHDISK_500 = $(DIR)/flashfs.500.jffs2
-all: buildjffs2
+all: buildjffs2-500
clean:
- rm -rf $(FLASHDISK) $(TMP_IMAGE)
+ rm -rf $(FLASHDISK_500) $(TMP_IMAGE)
-buildjffs2:
+buildjffs2-%:
rm -rf $(TMP_IMAGE)
- cp -dpR $(IMAGE) $(TMP_IMAGE)
- /usr/bin/find $(TMP_IMAGE) -name NOPRUNE -delete
- mkfs.jffs2 -l -U --pad=$(FLASHDISK_SIZE) -e $(BLOCK_SIZE) -d $(TMP_IMAGE) -o $(FLASHDISK)
+ cp -dpR ${IMAGE_$*} $(TMP_IMAGE)
+ find $(TMP_IMAGE) -name NOPRUNE -delete
+ $(FLASHFS_BIN) -l -U --pad=${FLASHDISK_SIZE_$*} -e $(BLOCK_SIZE) -d $(TMP_IMAGE) -o ${FLASHDISK_$*}
rm -rf $(TMP_IMAGE)
-.PHONY: buildjffs2
+.PHONY: buildjffs2-%
diff --git a/common/tools/flashfs/image/bin/NOPRUNE b/common/tools/flashfs/image_500/bin/NOPRUNE
index e69de29bb2..e69de29bb2 100644
--- a/common/tools/flashfs/image/bin/NOPRUNE
+++ b/common/tools/flashfs/image_500/bin/NOPRUNE
diff --git a/common/tools/flashfs/image/etc/NOPRUNE b/common/tools/flashfs/image_500/etc/NOPRUNE
index e69de29bb2..e69de29bb2 100644
--- a/common/tools/flashfs/image/etc/NOPRUNE
+++ b/common/tools/flashfs/image_500/etc/NOPRUNE
diff --git a/common/tools/flashfs/image/etc/init.d/NOPRUNE b/common/tools/flashfs/image_500/etc/init.d/NOPRUNE
index e69de29bb2..e69de29bb2 100644
--- a/common/tools/flashfs/image/etc/init.d/NOPRUNE
+++ b/common/tools/flashfs/image_500/etc/init.d/NOPRUNE
diff --git a/common/tools/flashfs/image/etc/network/NOPRUNE b/common/tools/flashfs/image_500/etc/network/NOPRUNE
index e69de29bb2..e69de29bb2 100644
--- a/common/tools/flashfs/image/etc/network/NOPRUNE
+++ b/common/tools/flashfs/image_500/etc/network/NOPRUNE
diff --git a/common/tools/flashfs/image/etc/plcdrv.conf b/common/tools/flashfs/image_500/etc/plcdrv.conf
index 6460ac5228..6460ac5228 100644
--- a/common/tools/flashfs/image/etc/plcdrv.conf
+++ b/common/tools/flashfs/image_500/etc/plcdrv.conf
diff --git a/common/tools/flashfs/image/lib/modules/NOPRUNE b/common/tools/flashfs/image_500/lib/modules/NOPRUNE
index e69de29bb2..e69de29bb2 100644
--- a/common/tools/flashfs/image/lib/modules/NOPRUNE
+++ b/common/tools/flashfs/image_500/lib/modules/NOPRUNE