aboutsummaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorGravatar Michał Leśniewski <mlesniew@gmail.com>2015-05-19 20:26:30 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2015-05-22 11:36:00 +0200
commite3904a890de2a74c290675fdb90324a6ed83e633 (patch)
tree2eb64cd2d16472e9aa29a3ddec97cfe7321062f8 /configs
parente8f4f052b14e21d617234a3705a1bee0f9c1dd36 (diff)
downloadbuildroot-e3904a890de2a74c290675fdb90324a6ed83e633.tar.gz
buildroot-e3904a890de2a74c290675fdb90324a6ed83e633.tar.bz2
fs/jffs2: Fix mkfs.jffs2 --pagesize parameter usage
Fixes #8186 Mkfs.jffs2 accepts a --pagesize parameter, which allows specifying the size of the virtual memory page size of the target machine, where the image will be used. (This is the value of the PAGE_SIZE macro in Linux.) In most cases the parameter doesn't need to be set as the default value of 4 kB is usually correct. The parameter was used incorrectly in Buildroot -- it was set to the page size of flash memory chip -- this commit fixes this problem. Now the --pagesize parameter is not used at all (unless the user explicitly chooses to use a custom value during configuration). All existing defconfigs were corrected to match the new configuration variable names. [Peter: reword, add Config.in.legacy handling] Signed-off-by: Michał Leśniewski <mlesniew@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'configs')
-rw-r--r--configs/mini2440_defconfig2
-rw-r--r--configs/openblocks_a6_defconfig2
-rw-r--r--configs/sheevaplug_defconfig2
3 files changed, 3 insertions, 3 deletions
diff --git a/configs/mini2440_defconfig b/configs/mini2440_defconfig
index d7d9ab1827..e8b55cdc26 100644
--- a/configs/mini2440_defconfig
+++ b/configs/mini2440_defconfig
@@ -8,7 +8,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttySAC0"
# Filesystem
BR2_TARGET_ROOTFS_JFFS2=y
-BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K=y
+BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_128K=y
BR2_TARGET_ROOTFS_JFFS2_PAGESIZE=0x800
BR2_TARGET_ROOTFS_JFFS2_EBSIZE=0x20000
BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y
diff --git a/configs/openblocks_a6_defconfig b/configs/openblocks_a6_defconfig
index d9994f298f..5147785061 100644
--- a/configs/openblocks_a6_defconfig
+++ b/configs/openblocks_a6_defconfig
@@ -9,7 +9,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
# filesystem
BR2_TARGET_ROOTFS_JFFS2=y
-BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K=y
+BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_128K=y
# Lock to 3.18 headers to avoid breaking with newer kernels
BR2_KERNEL_HEADERS_VERSION=y
diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index 5422f673cb..9e272fff8e 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -8,7 +8,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
# filesystem
BR2_TARGET_ROOTFS_JFFS2=y
-BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K=y
+BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_128K=y
# Lock down headers to avoid breaking with new defaults
BR2_KERNEL_HEADERS_VERSION=y