summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--target/jffs2/Config.in10
-rw-r--r--target/jffs2/jffs2root.mk6
2 files changed, 4 insertions, 12 deletions
diff --git a/target/jffs2/Config.in b/target/jffs2/Config.in
index e30754bc7..23503a93d 100644
--- a/target/jffs2/Config.in
+++ b/target/jffs2/Config.in
@@ -56,8 +56,6 @@ config BR2_TARGET_ROOTFS_JFFS2_PAGESIZE
default 0x1000 if BR2_TARGET_ROOTFS_JFFS2_FLASH_128
default 0x1000 if BR2_TARGET_ROOTFS_JFFS2_FLASH_64
default $(BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE) if BR2_TARGET_ROOTFS_JFFS2_CUSTOM
- help
- Set to pagesize of memory
config BR2_TARGET_ROOTFS_JFFS2_EBSIZE
hex
@@ -67,8 +65,6 @@ config BR2_TARGET_ROOTFS_JFFS2_EBSIZE
default 0x20000 if BR2_TARGET_ROOTFS_JFFS2_FLASH_128
default 0x10000 if BR2_TARGET_ROOTFS_JFFS2_FLASH_64
default $(BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE) if BR2_TARGET_ROOTFS_JFFS2_CUSTOM
- help
- Set to Erase Size of memory
config BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER
bool "Do not use Cleanmarker"
@@ -114,9 +110,9 @@ config BR2_TARGET_ROOTFS_JFFS2_SQUASH
config BR2_TARGET_ROOTFS_JFFS2_SUMMARY
bool "Produce a summarized JFFS2 image"
depends on BR2_TARGET_ROOTFS_JFFS2
- help
- A summarised image can be mounted faster if support is
- enabled in the kernel (CONFIG_JFFS2_SUMMARY)
+ help
+ A summarised image can be mounted faster if support is
+ enabled in the kernel (CONFIG_JFFS2_SUMMARY)
config BR2_TARGET_ROOTFS_JFFS2_OUTPUT
string "Output File"
diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk
index b58e5d2ad..41b129ddc 100644
--- a/target/jffs2/jffs2root.mk
+++ b/target/jffs2/jffs2root.mk
@@ -30,19 +30,15 @@ JFFS2_OPTS += -b
SUMTOOL_OPTS += -b
endif
-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
SUMTOOL_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)$(TARGET_DEVICE_TABLE),)
+ifneq ($(TARGET_DEVICE_TABLE),)
JFFS2_OPTS += -D $(TARGET_DEVICE_TABLE)
endif