aboutsummaryrefslogtreecommitdiff
path: root/target/jffs2
diff options
context:
space:
mode:
authorGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-01-24 23:18:08 +0000
committerGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-01-24 23:18:08 +0000
commit28f4689413206f9943e5a6c2f93689e66ef24f04 (patch)
tree84e616e57cd975dde2282eddf57ffbf03950d21f /target/jffs2
parent77a3b8679c1d662195453eafb23b3d3b2c01ede4 (diff)
downloadbuildroot-28f4689413206f9943e5a6c2f93689e66ef24f04.tar.gz
buildroot-28f4689413206f9943e5a6c2f93689e66ef24f04.tar.bz2
- Additional JFFS2 options to support Dataflash (Ulf Samuelsson)
- cleanup a bit while at it
Diffstat (limited to 'target/jffs2')
-rw-r--r--target/jffs2/Config.in25
-rw-r--r--target/jffs2/jffs2root.mk19
2 files changed, 36 insertions, 8 deletions
diff --git a/target/jffs2/Config.in b/target/jffs2/Config.in
index 7ee0b7051b..a16848ef58 100644
--- a/target/jffs2/Config.in
+++ b/target/jffs2/Config.in
@@ -5,6 +5,26 @@ config BR2_TARGET_ROOTFS_JFFS2
help
Build a jffs2 root filesystem
+config BR2_TARGET_ROOTFS_JFFS2_DEFAULT_PAGESIZE
+ bool "Use default 4 kB pagesize"
+ depends on BR2_TARGET_ROOTFS_JFFS2
+ default y
+
+config BR2_TARGET_ROOTFS_JFFS2_PAGESIZE
+ hex "Page Size (0x0 = Use default 4 kB)"
+ depends on !BR2_TARGET_ROOTFS_JFFS2_DEFAULT_PAGESIZE
+ default 0x420
+ help
+ Set to pagesize of memory (Dataflash is 0x210 or 0x420)
+
+config BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER
+ bool "Do not use Cleanmarker"
+ depends on !BR2_TARGET_ROOTFS_JFFS2_DEFAULT_PAGESIZE
+ default y
+ help
+ Do not use cleanmarkers if using NAND flash or Dataflash where
+ the pagesize is not a power of 2
+
config BR2_TARGET_ROOTFS_JFFS2_EBSIZE
hex "Erase block size"
depends on BR2_TARGET_ROOTFS_JFFS2
@@ -19,7 +39,7 @@ config BR2_TARGET_ROOTFS_JFFS2_PADSIZE
depends on BR2_TARGET_ROOTFS_JFFS2_PAD
default 0x0
help
- Set to 0x0 to pad to end of erase block.
+ Set to 0x0 to pad to end of erase block.
choice
prompt "Endianess"
@@ -50,6 +70,5 @@ config BR2_TARGET_ROOTFS_JFFS2_COPYTO
depends on BR2_TARGET_ROOTFS_JFFS2
default ""
help
- Copies the resulting image to a secondary location.
-
+ Copies the resulting image to a secondary location.
diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk
index f5622a8fb1..db0489d9a4 100644
--- a/target/jffs2/jffs2root.mk
+++ b/target/jffs2/jffs2root.mk
@@ -14,20 +14,29 @@ JFFS2_OPTS += -p
endif
endif
-ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2_SQUASH)),y)
+ifeq ($(BR2_TARGET_ROOTFS_JFFS2_SQUASH),y)
JFFS2_OPTS += -q
endif
-ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2_LE)),y)
+ifeq ($(BR2_TARGET_ROOTFS_JFFS2_LE),y)
JFFS2_OPTS += -l
endif
-ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2_BE)),y)
+ifeq ($(BR2_TARGET_ROOTFS_JFFS2_BE),y)
JFFS2_OPTS += -b
endif
-JFFS2_TARGET := $(subst ",,$(BR2_TARGET_ROOTFS_JFFS2_OUTPUT))
+ifneq ($(BR2_TARGET_ROOTFS_JFFS2_DEFAULT_PAGESIZE),y)
+JFFS2_OPTS += -s $(BR2_TARGET_ROOTFS_JFFS2_PAGESIZE)
+ifeq ($(BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER),y)
+JFFS2_OPTS += -n
+endif
+endif
+
+JFFS2_TARGET := $(strip $(subst ",,$(BR2_TARGET_ROOTFS_JFFS2_OUTPUT)))
+#"))
JFFS2_DEVFILE = $(strip $(subst ",,$(BR2_TARGET_ROOTFS_JFFS2_DEVFILE)))
+#"))
ifneq ($(JFFS2_DEVFILE),)
JFFS2_OPTS += -D $(TARGET_DEVICE_TABLE)
endif
@@ -62,7 +71,7 @@ $(JFFS2_TARGET): host-fakeroot makedevs mtd-host
@ls -l $(JFFS2_TARGET)
JFFS2_COPYTO := $(strip $(subst ",,$(BR2_TARGET_ROOTFS_JFFS2_COPYTO)))
-# " stupid syntax highlighting does not like unmatched quote from above line
+#"))
jffs2root: $(JFFS2_TARGET)
ifneq ($(JFFS2_COPYTO),)