Update JFFS2 page/erase size correctly

diff --git a/target/jffs2/Config.in b/target/jffs2/Config.in
index 268c1916f3ec9161d3e6be4c7386700934450f9c..45fa646e9a5c2fdfae617d87cfe5c4ae8ab1c5a8 100644 (file)
--- a/target/jffs2/Config.in
+++ b/target/jffs2/Config.in
@@ -6,47 +6,70 @@ config BR2_TARGET_ROOTFS_JFFS2
        help
          Build a jffs2 root filesystem
 
-
 choice
        prompt "Memory Type"
-       default BR2_TARGET_ROOTFS_JFFS2_FLASH
+       default BR2_TARGET_ROOTFS_JFFS2_FLASH_128
        depends on BR2_TARGET_ROOTFS_JFFS2
 
-config BR2_TARGET_ROOTFS_JFFS2_FLASH
-       bool "Parallel flash with 4 kB pagesize"
+config BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056
+       bool "AT45 dataflash with 1056 byte pagesize"
        depends on BR2_TARGET_ROOTFS_JFFS2
+       select BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER
 
-config BR2_TARGET_ROOTFS_JFFS2_DATAFLASH
-       bool "AT45 dataflash with 1056 byte pagesize"
+config BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528
+       bool "AT45 dataflash with 528 byte pagesize"
        depends on BR2_TARGET_ROOTFS_JFFS2
        select BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER
 
-endchoice
+config BR2_TARGET_ROOTFS_JFFS2_FLASH_128
+       bool "Parallel flash with 4 kB pagesize and 128 kB erase size"
+       depends on BR2_TARGET_ROOTFS_JFFS2
 
+config BR2_TARGET_ROOTFS_JFFS2_FLASH_64
+       bool "Parallel flash with 4 kB pagesize and 64 kB erase size"
+       depends on BR2_TARGET_ROOTFS_JFFS2
 
-config BR2_TARGET_ROOTFS_JFFS2_PAGESIZE
-       hex "Page Size"
-       depends on BR2_TARGET_ROOTFS_JFFS2_FLASH
-       default 0x1000
-       help
-         Set to pagesize of memory (Dataflash is 0x210 or 0x420)
+config BR2_TARGET_ROOTFS_JFFS2_CUSTOM
+       bool "Select custom page and erase size"
+       depends on BR2_TARGET_ROOTFS_JFFS2
 
-config BR2_TARGET_ROOTFS_JFFS2_PAGESIZE
+endchoice
+
+config BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE
        hex "Page Size"
-       depends on BR2_TARGET_ROOTFS_JFFS2_DATAFLASH
-       default 0x420
+       depends on BR2_TARGET_ROOTFS_JFFS2_CUSTOM
+       default 0x1000
        help
-         Set to pagesize of memory (Dataflash is 0x210 or 0x420)
+         Set to pagesize of memory
 
-config BR2_TARGET_ROOTFS_JFFS2_EBSIZE
+config BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE
        hex "Erase block size"
-       depends on BR2_TARGET_ROOTFS_JFFS2_FLASH
+       depends on BR2_TARGET_ROOTFS_JFFS2_CUSTOM
        default 0x20000
+       help
+         Set to erase size of memory
+
+config BR2_TARGET_ROOTFS_JFFS2_PAGESIZE
+       hex
+       depends on BR2_TARGET_ROOTFS_JFFS2
+       default 0x420 if BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056
+       default 0x210 if BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528
+       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 "Erase block size"
-       depends on BR2_TARGET_ROOTFS_JFFS2_DATAFLASH
-       default 0x2100
+       hex
+       depends on BR2_TARGET_ROOTFS_JFFS2
+       default 0x2100 if BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056
+       default 0x1080 if BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528
+       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"