summaryrefslogtreecommitdiff
path: root/arch/arm/configs/multi_v7_defconfig
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2019-04-29 09:39:55 +0300
committerOlof Johansson <olof@lixom.net>2019-04-29 09:39:55 +0300
commiteae7dae81e3a8b9806416d50190c52f46f6bd06d (patch)
treeea1dfc561686dee058d0f441260c09f95fb5c201 /arch/arm/configs/multi_v7_defconfig
parentfe08dd9eeaa309deaa3a78f0eaf88900caef1c2e (diff)
parentb266731b76d5c33c0f6d781c449e43ad9991fb70 (diff)
downloadlinux-eae7dae81e3a8b9806416d50190c52f46f6bd06d.tar.xz
Merge tag 'renesas-arm-defconfig-for-v5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into arm/defconfig
Renesas ARM Based SoC Defconfig Updates for v5.2 shmobile and multi_v7 defconfigs * Enable support for CFI NOR FLASH shmobile defconfig * Enable USB [EO]HCI HCD PLATFORM and PHY_RCAR_GEN3_USB2 * Refresh for v5.1-rc1 * tag 'renesas-arm-defconfig-for-v5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Enable USB [EO]HCI HCD PLATFORM support in shmobile_defconfig ARM: shmobile: Enable PHY_RCAR_GEN3_USB2 in shmobile_defconfig ARM: multi_v7_defconfig: Enable support for CFI NOR FLASH ARM: shmobile: defconfig: Enable support for CFI NOR FLASH ARM: shmobile: defconfig: Refresh for v5.1-rc1 Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
-rw-r--r--arch/arm/configs/multi_v7_defconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 547775ffc383..1aab5350212e 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -183,6 +183,10 @@ CONFIG_SIMPLE_PM_BUS=y
CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_OF=y
CONFIG_MTD_M25P80=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_DENALI_DT=y