From cb5f1b9d22bfc7802b3eccb2c650ccf2bd8b358e Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Fri, 1 Sep 2017 09:53:19 -0500 Subject: ARM: davinci_all_defconfig: enable MTD_CMDLINE_PARTS There is some disagreement between the partition table map in Linux for the DA850-EVM and the corresponding partition map in U-Boot. To prevent breaking the Kernel, this patch enables MTD_CMDLINE_PARTS which will allow the U-Boot to pass the partition map so future partitions match without breaking backwards compatibility. While at it, also sync to savedefconfig which leads to removal of CONFIG_MMC_BLOCK_BOUNCE. Signed-off-by: Adam Ford Signed-off-by: Sekhar Nori --- arch/arm/configs/davinci_all_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/configs') diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index 27d9720f7207..4d432cf1ee79 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig @@ -59,6 +59,7 @@ CONFIG_DEVTMPFS_MOUNT=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 +196,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 -- cgit v1.2.3 From 5627453efabf8eef84ce1dce6767d1268570a6c5 Mon Sep 17 00:00:00 2001 From: Suman Anna Date: Wed, 20 Sep 2017 13:01:32 -0500 Subject: ARM: davinci_all_defconfig: enable CMA options Enable the CMA and DMA_CMA Kconfig options by default for Davinci platforms. Davinci remoteproc driver is one of the modules that depends on these options, and this allows the driver to be made visible for selection with menuconfig. Signed-off-by: Suman Anna Signed-off-by: Sekhar Nori --- arch/arm/configs/davinci_all_defconfig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/configs') diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index 4d432cf1ee79..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,6 +57,7 @@ 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 -- cgit v1.2.3