From f1d9576eb880cc170ba2b501b2fab758789f18ec Mon Sep 17 00:00:00 2001 From: Andrejs Cainikovs Date: Mon, 7 Nov 2022 14:11:28 +0100 Subject: toradex_defconfig: remove cma configuration Verdin boards rely on CMA configuration in device tree instead. Upstream-Status: Inappropriate [downstream specific] Signed-off-by: Andrejs Cainikovs --- arch/arm64/configs/toradex_defconfig | 6 +----- arch/arm64/configs/toradex_imx_v8.config | 12 ------------ 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/arch/arm64/configs/toradex_defconfig b/arch/arm64/configs/toradex_defconfig index 21e07e00e841..d49ffbbb16ae 100644 --- a/arch/arm64/configs/toradex_defconfig +++ b/arch/arm64/configs/toradex_defconfig @@ -89,8 +89,6 @@ CONFIG_KSM=y CONFIG_MEMORY_FAILURE=y CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_CMA=y -CONFIG_CMA_SYSFS=y -CONFIG_CMA_AREAS=7 CONFIG_ZSMALLOC=y CONFIG_NET=y CONFIG_PACKET=y @@ -1041,9 +1039,7 @@ CONFIG_INDIRECT_PIO=y CONFIG_CRC_CCITT=m CONFIG_CRC8=y CONFIG_DMA_CMA=y -CONFIG_CMA_SIZE_MBYTES=1376 -CONFIG_CMA_SIZE_PERCENTAGE=25 -CONFIG_CMA_SIZE_SEL_MIN=y +CONFIG_CMA_SIZE_MBYTES=32 CONFIG_PRINTK_TIME=y CONFIG_DYNAMIC_DEBUG=y CONFIG_DEBUG_INFO=y diff --git a/arch/arm64/configs/toradex_imx_v8.config b/arch/arm64/configs/toradex_imx_v8.config index 8db3bb226378..a30bfc73da4d 100644 --- a/arch/arm64/configs/toradex_imx_v8.config +++ b/arch/arm64/configs/toradex_imx_v8.config @@ -98,18 +98,6 @@ CONFIG_NTFS_RW=y # Ease debugging since this config is used to produce a reference image only CONFIG_DYNAMIC_DEBUG=y -# Setting up CMA memory to a value which works for most -CONFIG_CMA_AREAS=7 -CONFIG_CMA_SIZE_MBYTES=1376 -CONFIG_CMA_SIZE_PERCENTAGE=25 -CONFIG_CMA_SYSFS=y -# These four configs need to go together and only one can be enabled, as it is -# a choice field -CONFIG_CMA_SIZE_SEL_MIN=y -CONFIG_CMA_SIZE_SEL_MBYTES=n -CONFIG_CMA_SIZE_SEL_PERCENTAGE=n -CONFIG_CMA_SIZE_SEL_MAX=n - # Load SDMA as a module to prevent errors/timeouts on boot CONFIG_IMX_SDMA=m -- cgit v1.2.3