diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-04-26 10:44:54 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-04-26 10:44:54 -0400 |
| commit | a0a2d0501d37d52711d47ea6cafb010822b442fd (patch) | |
| tree | 937f14c266306f599a0966800f9a7417314325f1 | |
| parent | 6d08b06e67cd117f6992c46611dfb4ce267cd71e (diff) | |
| parent | 6e8fe39989720b87439fee7817a5ca362b16d931 (diff) | |
Merge tag 'socfpga_defconfig_fix_v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into fixes
ARM: socfpga_defconfig: fix QSPI Sector 4k
- disable CONFIG_MTD_SPI_NOR_USE_4K_SECTORS
* tag 'socfpga_defconfig_fix_v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
ARM: socfpga_defconfig: Remove QSPI Sector 4K size force
| -rw-r--r-- | arch/arm/configs/socfpga_defconfig | 1 |
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 | |||
| 57 | CONFIG_MTD_NAND=y | 57 | CONFIG_MTD_NAND=y |
| 58 | CONFIG_MTD_NAND_DENALI_DT=y | 58 | CONFIG_MTD_NAND_DENALI_DT=y |
| 59 | CONFIG_MTD_SPI_NOR=y | 59 | CONFIG_MTD_SPI_NOR=y |
| 60 | # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set | ||
| 60 | CONFIG_SPI_CADENCE_QUADSPI=y | 61 | CONFIG_SPI_CADENCE_QUADSPI=y |
| 61 | CONFIG_OF_OVERLAY=y | 62 | CONFIG_OF_OVERLAY=y |
| 62 | CONFIG_OF_CONFIGFS=y | 63 | CONFIG_OF_CONFIGFS=y |