summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorThor Thayer <thor.thayer@linux.intel.com>2018-03-26 14:50:00 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-01 12:58:22 -0700
commit0ddb53a67cbdd8eda6bd4e72870b7de0499e2e7b (patch)
treed15ca5b3a78e85f966a1e8ff77c384e2eb26f37e /arch
parentf671ee8de31a3c2702250e64e5f18ebceb21f1e6 (diff)
ARM: socfpga_defconfig: Remove QSPI Sector 4K size force
commit 6e8fe39989720b87439fee7817a5ca362b16d931 upstream. Remove QSPI Sector 4K size force which is causing QSPI boot problems with the JFFS2 root filesystem. Fixes the following error: "Magic bitmask 0x1985 not found at ..." Cc: stable@vger.kernel.org Signed-off-by: Thor Thayer <thor.thayer@linux.intel.com> Signed-off-by: Dinh Nguyen <dinguyen@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/socfpga_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig
index 2620ce790db0..371fca4e1ab7 100644
--- a/arch/arm/configs/socfpga_defconfig
+++ b/arch/arm/configs/socfpga_defconfig
@@ -57,6 +57,7 @@ CONFIG_MTD_M25P80=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_DENALI_DT=y
CONFIG_MTD_SPI_NOR=y
+# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
CONFIG_SPI_CADENCE_QUADSPI=y
CONFIG_OF_OVERLAY=y
CONFIG_OF_CONFIGFS=y