summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Dufour2013-02-05 11:08:08 +0100
committerCyril Jourdan2013-02-11 13:22:45 +0100
commit4e2f673656846ce0152a94bc2b8333ae292578e3 (patch)
tree1b60c9ee9e23feeb0103386b83f32d3d3e27d123
parent5748c8fdb99d7d7ab4ed33eb01d60e39d6ccdafa (diff)
{cleo, polux}: remove tools/flashfs directory, refs #3745
-rw-r--r--cleopatre/Config.bundle-common4
-rw-r--r--cleopatre/Makefile6
-rw-r--r--cleopatre/tools/flashfs/.gitignore1
-rwxr-xr-xcleopatre/tools/flashfs/Makefile39
-rw-r--r--cleopatre/tools/flashfs/image/bin/NOPRUNE0
-rw-r--r--cleopatre/tools/flashfs/image/etc/NOPRUNE0
-rw-r--r--cleopatre/tools/flashfs/image/etc/init.d/NOPRUNE0
-rw-r--r--cleopatre/tools/flashfs/image/etc/network/NOPRUNE0
-rw-r--r--cleopatre/tools/flashfs/image/etc/plcdrv.conf14
-rw-r--r--cleopatre/tools/flashfs/image/lib/modules/NOPRUNE0
-rw-r--r--polux/Makefile5
-rw-r--r--polux/tools/Makefile2
-rw-r--r--polux/tools/flashfs/.gitignore1
-rwxr-xr-xpolux/tools/flashfs/Makefile54
-rw-r--r--polux/tools/flashfs/image/autoconf/NOPRUNE0
-rw-r--r--polux/tools/flashfs/image/bin/NOPRUNE0
-rw-r--r--polux/tools/flashfs/image/etc/config/NOPRUNE0
-rw-r--r--polux/tools/flashfs/image/etc/network/NOPRUNE0
-rwxr-xr-xpolux/tools/flashfs/image/etc/rcS.d/99custom1
-rw-r--r--polux/tools/flashfs/image/tmp/NOPRUNE0
20 files changed, 12 insertions, 115 deletions
diff --git a/cleopatre/Config.bundle-common b/cleopatre/Config.bundle-common
index 7e849a4372..b391921687 100644
--- a/cleopatre/Config.bundle-common
+++ b/cleopatre/Config.bundle-common
@@ -7,7 +7,7 @@ FCM3_UNUSE=buildroot/target/device/Spidcom/arizona \
u-boot-1.1.6/include/asm-arm/arch-spc300-fcm3 \
linux-2.6.25.10-spc300/arch/arm/mach-spc300/board-arizona.c
-FLASHFS_UNUSE=tools/flashfs/image/etc/init.d/S50plctest \
- tools/flashfs/image/etc/plcdrv.conf
+FLASHFS_UNUSE=tools/flashfs/image_500/etc/init.d/S50plctest \
+ tools/flashfs/image_500/etc/plcdrv.conf tools/flashfs/image_200
SPIDUPD_UNUSE=tools/spidupd/Makefile tools/spidupd/inc tools/spidupd/src
NVRAM_UNUSE=
diff --git a/cleopatre/Makefile b/cleopatre/Makefile
index c1225e6f76..c202509d4b 100644
--- a/cleopatre/Makefile
+++ b/cleopatre/Makefile
@@ -57,7 +57,7 @@ UBOOT_PATH=$(BUNDLE_PATH)/u-boot-$(UBOOT_VERSION)
UBOOT_TMP_PATH=$(BUNDLE_TMP_PATH)/u-boot-$(UBOOT_VERSION)
# FLASHFS is used once the cleopatre as been renamed to bundle
-FLASHFS_NAME=flashfs.jffs2
+FLASHFS_NAME=flashfs.*.jffs2
FLASHFS_PATH=$(BUNDLE_TMP_PATH)/tools/flashfs
##################################################################
@@ -97,6 +97,8 @@ bundle-standalone:
$(Q)(cd $(GIT_BASE) && git archive --format=tar HEAD: $(GIT_DIRECTORIES)) | tar -x -C $(WORK_DIRECTORY)
$(Q)$(MAKE) -C $(LIBMME_PATH) bundle
$(Q)cp -R $(CLEOPATRE_PATH) $(BUNDLE_PATH)
+ $(Q)cp -R $(COMMON_PATH)/tools/flashfs $(BUNDLE_PATH)/tools
+ $(Q)sed -i -e 's/buildjffs2-200//g' $(BUNDLE_PATH)/tools/flashfs/Makefile
$(Q)cp -R $(COMMON_PATH)/tools/genNVRAM $(BUNDLE_PATH)/tools
$(Q)sed -i -e 's/\(BUNDLE_DIR=\)n/\1y/' $(BUNDLE_PATH)/tools/genNVRAM/Makefile
$(Q)echo "Generate PLC binaries..."
@@ -185,5 +187,5 @@ linux:
flashfs:
$(Q)$(MAKE) -C $(FLASHFS_PATH)
- $(Q)cp $(FLASHFS_PATH)/$(FLASHFS_NAME) $(BUNDLE_GENBIN_PATH)/$(FLASHFS_NAME)
+ $(Q)cp $(FLASHFS_PATH)/$(FLASHFS_NAME) $(BUNDLE_GENBIN_PATH)/
diff --git a/cleopatre/tools/flashfs/.gitignore b/cleopatre/tools/flashfs/.gitignore
deleted file mode 100644
index f1e12b42e5..0000000000
--- a/cleopatre/tools/flashfs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/flashfs.jffs2
diff --git a/cleopatre/tools/flashfs/Makefile b/cleopatre/tools/flashfs/Makefile
deleted file mode 100755
index e101c3572e..0000000000
--- a/cleopatre/tools/flashfs/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# BLOCK_SIZE : Size of a block for your flash device
-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
-
-
-
-DIR=$(CURDIR)
-IMAGE = $(DIR)/image
-TMP_IMAGE = /tmp/fimage
-FLASHDISK = $(DIR)/flashfs.jffs2
-
-all: buildjffs2
-
-clean:
- rm -rf $(FLASHDISK) $(TMP_IMAGE)
-
-$(FLASHDISK): buildjffs2
-
-buildjffs2:
- rm -rf $(TMP_IMAGE)
- cp -dpR $(IMAGE) $(TMP_IMAGE)
- /usr/bin/find $(TMP_IMAGE) -name NOPRUNE -exec echo {} > /tmp/list \;
- rm -f `cat /tmp/list`
- rm -f /tmp/list
- mkfs.jffs2 -l --pad=$(FLASHDISK_SIZE) -e $(BLOCK_SIZE) -d $(TMP_IMAGE) -o $(FLASHDISK)
- rm -rf $(TMP_IMAGE)
-
-.PHONY: buildjffs2
-
-
-
-
-
-
diff --git a/cleopatre/tools/flashfs/image/bin/NOPRUNE b/cleopatre/tools/flashfs/image/bin/NOPRUNE
deleted file mode 100644
index e69de29bb2..0000000000
--- a/cleopatre/tools/flashfs/image/bin/NOPRUNE
+++ /dev/null
diff --git a/cleopatre/tools/flashfs/image/etc/NOPRUNE b/cleopatre/tools/flashfs/image/etc/NOPRUNE
deleted file mode 100644
index e69de29bb2..0000000000
--- a/cleopatre/tools/flashfs/image/etc/NOPRUNE
+++ /dev/null
diff --git a/cleopatre/tools/flashfs/image/etc/init.d/NOPRUNE b/cleopatre/tools/flashfs/image/etc/init.d/NOPRUNE
deleted file mode 100644
index e69de29bb2..0000000000
--- a/cleopatre/tools/flashfs/image/etc/init.d/NOPRUNE
+++ /dev/null
diff --git a/cleopatre/tools/flashfs/image/etc/network/NOPRUNE b/cleopatre/tools/flashfs/image/etc/network/NOPRUNE
deleted file mode 100644
index e69de29bb2..0000000000
--- a/cleopatre/tools/flashfs/image/etc/network/NOPRUNE
+++ /dev/null
diff --git a/cleopatre/tools/flashfs/image/etc/plcdrv.conf b/cleopatre/tools/flashfs/image/etc/plcdrv.conf
deleted file mode 100644
index 6460ac5228..0000000000
--- a/cleopatre/tools/flashfs/image/etc/plcdrv.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-OPTIONS=""
-
-for i in $(cat /proc/cmdline)
-do
- if [[ "${i%%=*}" == "plcdrv" ]]
- then
- plcdrv=${i##plcdrv=}
- fi
- if [[ "${i%%=*}" == "plcfw" ]]
- then
- plcfw=${i##plcfw=}
- fi
-done
-
diff --git a/cleopatre/tools/flashfs/image/lib/modules/NOPRUNE b/cleopatre/tools/flashfs/image/lib/modules/NOPRUNE
deleted file mode 100644
index e69de29bb2..0000000000
--- a/cleopatre/tools/flashfs/image/lib/modules/NOPRUNE
+++ /dev/null
diff --git a/polux/Makefile b/polux/Makefile
index 7273885914..593beca907 100644
--- a/polux/Makefile
+++ b/polux/Makefile
@@ -12,6 +12,7 @@ PLC_DIR:=$(DEVKIT_DIR)/plc-polux
BUSYBOX_DIR:=$(APP_DIR)/busybox
BINARIES_DIR=$(TOPDIR)/binaries
+FLASHFS_DIR_FROM_BASE:=common/tools/flashfs
GENNVRAM_DIR_FROM_BASE:=common/tools/genNVRAM
UBOOT_DIR_FROM_BASE:=cleopatre/u-boot-1.1.6
@@ -463,6 +464,10 @@ bundle:
cp -r $(BASE_DIR)/common/tools/mksimage $(BUNDLE_DIR)/linux-2.6.10/scripts
$(BUNDLE_DIR)/linux-2.6.10/scripts/cpincludes $(BUNDLE_DIR)/linux-2.6.10 $(BASE_DIR)/common
rm -f $(BUNDLE_DIR)/linux-2.6.10/scripts/cpincludes
+ #prepare flashfs part
+ (cd $(BASE_DIR) && git archive --format=tar --prefix flashfs/ HEAD:$(FLASHFS_DIR_FROM_BASE)) | tar -x -C $(BUNDLE_DIR)/tools
+ sed -i -e 's/buildjffs2-500//g' $(BUNDLE_DIR)/tools/flashfs/Makefile
+ rm -rf $(BUNDLE_DIR)/tools/flashfs/image_500
#prepare genNVRAM part
(cd $(BASE_DIR) && git archive --format=tar --prefix genNVRAM/ HEAD:$(GENNVRAM_DIR_FROM_BASE)) | tar -x -C $(BUNDLE_DIR)/tools
sed -i -e 's/\(BUNDLE_DIR=\)n/\1y/' $(BUNDLE_DIR)/tools/genNVRAM/Makefile
diff --git a/polux/tools/Makefile b/polux/tools/Makefile
index 1377915a08..70e82f36b3 100644
--- a/polux/tools/Makefile
+++ b/polux/tools/Makefile
@@ -1,6 +1,6 @@
#
CC := gcc
-OBJ := mtd-utils flashfs mkimagedesc
+OBJ := mtd-utils mkimagedesc
DIR=$(shell pwd)
export CC
diff --git a/polux/tools/flashfs/.gitignore b/polux/tools/flashfs/.gitignore
deleted file mode 100644
index f1e12b42e5..0000000000
--- a/polux/tools/flashfs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/flashfs.jffs2
diff --git a/polux/tools/flashfs/Makefile b/polux/tools/flashfs/Makefile
deleted file mode 100755
index 7729a8d82d..0000000000
--- a/polux/tools/flashfs/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# BLOCK_SIZE : Size of a block for your flash device
-BLOCK_SIZE= 65536 #for example TE28F640C3 (SPK and SPR)
-#BLOCK_SIZE= 131072 #for example TE28F640J3 (SCR)
-
-# 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 #you can use it with TE28F640C3 (SPK and SPR)
-#FLASHDISK_SIZE = 655360 #you can use it with TE28F640J3 (SCR)
-
-DIR=$(shell pwd)
-TOOLSDIR=$(DIR)/..
-
-IMAGE = $(DIR)/image
-TMP_IMAGE = /tmp/fimage
-FLASHDISK = $(DIR)/flashfs.jffs2
-UTILDIR=$(TOOLSDIR)/mtd-utils
-LINUXIMG=$(TOOLSDIR)/../linux-2.6.10/arch/arm/boot/zImage
-LINUXUPGRD=./LinuxUpgrade.bin
-
-all: buildjffs2
-
-$(FLASHDISK): buildjffs2
-
-buildjffs2:
- echo $(IMAGE)
- rm -rf $(TMP_IMAGE)
- cp -dpR $(IMAGE) $(TMP_IMAGE)
- if [ -d $(TMP_IMAGE)/share ]; then chmod a+x $(TMP_IMAGE)/share/www/cgi-bin/*; fi
- find $(TMP_IMAGE) -name "*~" -exec rm -f {} \;
- rm -f /tmp/list
- find $(TMP_IMAGE) -name CVS -exec echo {} > /tmp/list \;
- rm -rf `cat /tmp/list`
- rm -f /tmp/list
- find $(TMP_IMAGE) -name NOPRUNE -exec echo {} > /tmp/list \;
- rm -f `cat /tmp/list`
- rm -f /tmp/list
- rm -rf $(TMP_IMAGE)/network
- $(UTILDIR)/mkfs.jffs2 --squash-uids --pad=$(FLASHDISK_SIZE) -e $(BLOCK_SIZE) -d $(TMP_IMAGE) -o $(FLASHDISK)
- rm -rf $(TMP_IMAGE)
-
-upgrade: $(FLASHDISK) $(LINUXIMG)
- rm -f $(LINUXUPGRD)
- cat $(FLASHDISK) $(LINUXIMG) > $(LINUXUPGRD)
-
-$(LINUXIMG):
- @echo "Linux zImage not built."
- @ [ -f $(LINUXIMG) ]
-
-clean:
- rm -rf $(FLASHDISK) $(TMP_IMAGE)
- rm -f $(DIR)/flashfs.jffs2
-
-.PHONY: buildjffs2
diff --git a/polux/tools/flashfs/image/autoconf/NOPRUNE b/polux/tools/flashfs/image/autoconf/NOPRUNE
deleted file mode 100644
index e69de29bb2..0000000000
--- a/polux/tools/flashfs/image/autoconf/NOPRUNE
+++ /dev/null
diff --git a/polux/tools/flashfs/image/bin/NOPRUNE b/polux/tools/flashfs/image/bin/NOPRUNE
deleted file mode 100644
index e69de29bb2..0000000000
--- a/polux/tools/flashfs/image/bin/NOPRUNE
+++ /dev/null
diff --git a/polux/tools/flashfs/image/etc/config/NOPRUNE b/polux/tools/flashfs/image/etc/config/NOPRUNE
deleted file mode 100644
index e69de29bb2..0000000000
--- a/polux/tools/flashfs/image/etc/config/NOPRUNE
+++ /dev/null
diff --git a/polux/tools/flashfs/image/etc/network/NOPRUNE b/polux/tools/flashfs/image/etc/network/NOPRUNE
deleted file mode 100644
index e69de29bb2..0000000000
--- a/polux/tools/flashfs/image/etc/network/NOPRUNE
+++ /dev/null
diff --git a/polux/tools/flashfs/image/etc/rcS.d/99custom b/polux/tools/flashfs/image/etc/rcS.d/99custom
deleted file mode 100755
index 1a2485251c..0000000000
--- a/polux/tools/flashfs/image/etc/rcS.d/99custom
+++ /dev/null
@@ -1 +0,0 @@
-#!/bin/sh
diff --git a/polux/tools/flashfs/image/tmp/NOPRUNE b/polux/tools/flashfs/image/tmp/NOPRUNE
deleted file mode 100644
index e69de29bb2..0000000000
--- a/polux/tools/flashfs/image/tmp/NOPRUNE
+++ /dev/null