diff options
| author | Olof Johansson <olof@lixom.net> | 2018-07-18 18:38:53 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-07-18 18:38:53 +0300 |
| commit | 28f6f7295fe14d5fb8a204881bd382edeb06401e (patch) | |
| tree | 08c56bf72c760b48b80224136870e0983ffdf2cf /arch/arm/configs/multi_v7_defconfig | |
| parent | 6783a9e0b41756d8d3db87b4a6e6711a6dbcd4b7 (diff) | |
| parent | b4645695a9dca5bbdcb9d6133731d661d2a3c4fb (diff) | |
| download | linux-28f6f7295fe14d5fb8a204881bd382edeb06401e.tar.xz | |
Merge tag 'mvebu-defconfig-4.19-1' of git://git.infradead.org/linux-mvebu into next/defconfig
mvebu defconfig for 4.19 (part 1)
- add NAND controller on multi_v7
- add SFP support on mvebu_v7
* tag 'mvebu-defconfig-4.19-1' of git://git.infradead.org/linux-mvebu:
ARM: mvebu_v7_defconfig: enable SFP support
ARM: mvebu_v7_defconfig: sync defconfig
ARM: multi_v7_defconfig: Add Marvell NAND controller support
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_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 4d781aa1a207..0626b6715984 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -184,6 +184,7 @@ CONFIG_MTD_NAND_DENALI_DT=y CONFIG_MTD_NAND_OMAP2=y CONFIG_MTD_NAND_OMAP_BCH=y CONFIG_MTD_NAND_ATMEL=y +CONFIG_MTD_NAND_MARVELL=y CONFIG_MTD_NAND_GPMI_NAND=y CONFIG_MTD_NAND_BRCMNAND=y CONFIG_MTD_NAND_VF610_NFC=y |