summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorOctavian Purdila <octavian.purdila@nxp.com>2017-04-19 15:50:04 +0300
committerLeonard Crestez <leonard.crestez@nxp.com>2018-08-24 12:41:33 +0300
commit7b2358e3ac5d3396249ef3fd0faaf4c73791f347 (patch)
tree66559ed588d71e52217f6e4aefb037e1c2fc14bf /arch/arm/configs
parentea3b709b3c439562d8e6a5e250f65afedd51a790 (diff)
MLK-14667 ARM: imx v7/v7_mfg defconfig: disable CONFIG_MTD_SPI_NOR_USE_4K_SECTORS
Commit 556fa2d7d7e9 ("ENGR00318895-9: mtd: spi-nor: add more read transfer flags for n25q256a") was incompletely cherry-picked, leaving out the removal of the SECT_4K flag: "From the datasheet, the chip support the 64K sector erase operation. So remove the SECT_4K for the chip which makes the flash_erase faster." However, the above statement is not entirely correct. Using SECT_4K can result in faster erase operations, if the block to erase is smaller. The documentation in spi-nor.c also states: "All newly added entries should describe *hardware* and should use SECT_4K (or SECT_4K_PMC) if hardware supports erasing 4 KiB sectors. For usage scenarios excluding small sectors there is config option that can be disabled: CONFIG_MTD_SPI_NOR_USE_4K_SECTORS. For historical (and compatibility) reasons (before we got above config) some old entries may be missing 4K flag." Unfortunately, using SECT_4K means that ubifs will fail, because it needs a minimum LBE of 15K. Based on the above comments, it looks like the best way to handle the ubifs issue is to disable CONFIG_MTD_SPI_NOR_USE_4K_SECTORS instead of removing SECT_4K for the particular n25q256a chip. This approach also has the advantage that will make ubifs work with any chip that has the SECT_4K flag. Signed-off-by: Octavian Purdila <octavian.purdila@nxp.com> Reviewed-by: Han Xu <han.xu@nxp.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/imx_v7_defconfig1
-rw-r--r--arch/arm/configs/imx_v7_mfg_defconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig
index 2c3ae9811265..9c75e080a909 100644
--- a/arch/arm/configs/imx_v7_defconfig
+++ b/arch/arm/configs/imx_v7_defconfig
@@ -105,6 +105,7 @@ CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_GPMI_NAND=y
CONFIG_MTD_NAND_MXC=y
CONFIG_MTD_SPI_NOR=y
+# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
CONFIG_SPI_FSL_QUADSPI=y
CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=y
diff --git a/arch/arm/configs/imx_v7_mfg_defconfig b/arch/arm/configs/imx_v7_mfg_defconfig
index def5048c0a0e..b137a506ac35 100644
--- a/arch/arm/configs/imx_v7_mfg_defconfig
+++ b/arch/arm/configs/imx_v7_mfg_defconfig
@@ -87,6 +87,7 @@ CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_GPMI_NAND=y
CONFIG_MTD_NAND_MXC=y
CONFIG_MTD_SPI_NOR=y
+# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
CONFIG_SPI_FSL_QUADSPI=y
CONFIG_MTD_UBI=y
CONFIG_BLK_DEV_LOOP=y