diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-19 22:43:31 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-19 22:43:31 +0200 |
| commit | 82e3c83e23ff0d08de575e359b5eb5e50c7f894f (patch) | |
| tree | f7a20005bf3213a8793b5c9f2ecdabe7be5da9e2 /arch/arm/configs | |
| parent | 06743cbfc5e11d6af3293e4f7e5468ab83f3e369 (diff) | |
| parent | 5627453efabf8eef84ce1dce6767d1268570a6c5 (diff) | |
Merge tag 'davinci-for-v4.15/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc
Pull "DaVinci defconfig updates for v4.15" from Sekhar Nori:
Enable CMA and MTD command line partitioning support.
* tag 'davinci-for-v4.15/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci_all_defconfig: enable CMA options
ARM: davinci_all_defconfig: enable MTD_CMDLINE_PARTS
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/davinci_all_defconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index 27d9720f7207..bd0cf22f9ceb 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig @@ -34,6 +34,7 @@ CONFIG_DAVINCI_MUX_WARNINGS=y CONFIG_DAVINCI_RESET_CLOCKS=y CONFIG_PREEMPT=y CONFIG_AEABI=y +CONFIG_CMA=y CONFIG_SECCOMP=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 @@ -56,9 +57,11 @@ CONFIG_NETFILTER=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_FW_LOADER is not set +CONFIG_DMA_CMA=y CONFIG_DA8XX_MSTPRI=y CONFIG_MTD=m CONFIG_MTD_TESTS=m +CONFIG_MTD_CMDLINE_PARTS=m CONFIG_MTD_BLOCK=m CONFIG_MTD_CFI=m CONFIG_MTD_CFI_INTELEXT=m @@ -195,7 +198,6 @@ CONFIG_USB_G_SERIAL=m CONFIG_USB_G_PRINTER=m CONFIG_USB_CDC_COMPOSITE=m CONFIG_MMC=y -# CONFIG_MMC_BLOCK_BOUNCE is not set CONFIG_MMC_DAVINCI=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=m |