MA-19204-9 [Android] enable dmabuf heap defconfig

add dmabuf and remove ion configure

Change-Id: Ife2d4eb77afb6136be647ae548b57418ee42e1e5
Signed-off-by: zhang sanshan <pete.zhang@nxp.com>

arch/arm64/configs/imx8mm_gki.fragment

@@ -16,10 +16,6 @@ CONFIG_DRM_IMX_SEC_DSIM=m
 CONFIG_DRM_ETNAVIV=m
 CONFIG_DRM_PANEL_RAYDIUM_RM67191=m
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
-CONFIG_ION=m
-CONFIG_ION_SYSTEM_HEAP=m
-CONFIG_ION_CMA_HEAP=m
-CONFIG_ION_UNMAPPED_HEAP=m
 
 CONFIG_CLK_IMX8MM=m
 # CONFIG_MXC_VPU_MALONE is not set
@@ -96,3 +92,7 @@ CONFIG_STATIC_USERMODEHELPER_PATH="/system/bin/sh"
 # CONFIG_LTO_CLANG_FULL is not set
 # CONFIG_CFI_CLANG is not set
 # CONFIG_ARM64_BTI_KERNEL is not set
+
+CONFIG_DMABUF_HEAPS_SYSTEM=m
+CONFIG_DMABUF_HEAPS_CMA=m
+CONFIG_DMABUF_HEAPS_SECURE=m

arch/arm64/configs/imx8mp_gki.fragment

@@ -16,8 +16,6 @@ CONFIG_REGULATOR_PCA9450=m
 CONFIG_PWM_IMX27=m
 CONFIG_BACKLIGHT_PWM=m
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
-CONFIG_ION_CMA_HEAP=m
-CONFIG_ION_UNMAPPED_HEAP=m
 CONFIG_PHY_FSL_IMX8MP_LVDS=m
 CONFIG_PHY_SAMSUNG_HDMI_PHY=m
 CONFIG_MXC_GPU_VIV=m
@@ -102,11 +100,13 @@ CONFIG_ARM_IMX_CPUFREQ_DT=m
 
 CONFIG_STATIC_USERMODEHELPER_PATH="/system/bin/sh"
 
-CONFIG_ION=m
-CONFIG_ION_SYSTEM_HEAP=m
 
 # CONFIG_LTO_CLANG_FULL is not set
 # CONFIG_CFI_CLANG is not set
 # CONFIG_ARM64_BTI_KERNEL is not set
 
 CONFIG_FORCE_MAX_ZONEORDER=14
+
+CONFIG_DMABUF_HEAPS_SYSTEM=m
+CONFIG_DMABUF_HEAPS_CMA=m
+CONFIG_DMABUF_HEAPS_SECURE=m

arch/arm64/configs/imx8mq_gki.fragment

@@ -39,11 +39,6 @@ CONFIG_SPI_IMX=m
 
 CONFIG_IMX_MBOX=m
 
-CONFIG_ION=m
-CONFIG_ION_SYSTEM_HEAP=m
-CONFIG_ION_CMA_HEAP=m
-CONFIG_ION_UNMAPPED_HEAP=m
-
 CONFIG_RESET_IMX7=m
 
 CONFIG_PHY_FSL_IMX8MQ_USB=m
@@ -117,3 +112,7 @@ CONFIG_MXS_DMA=m
 CONFIG_RESET_GPIO=m
 CONFIG_REGULATOR_GPIO=m
 CONFIG_IR_GPIO_CIR=m
+
+CONFIG_DMABUF_HEAPS_SYSTEM=m
+CONFIG_DMABUF_HEAPS_CMA=m
+CONFIG_DMABUF_HEAPS_SECURE=m

arch/arm64/configs/imx_v8_android_defconfig

@@ -950,6 +950,7 @@ CONFIG_DMATEST=y
 CONFIG_DMABUF_HEAPS=y
 CONFIG_DMABUF_HEAPS_SYSTEM=y
 CONFIG_DMABUF_HEAPS_CMA=y
+CONFIG_DMABUF_HEAPS_SECURE=y
 CONFIG_UIO=y
 CONFIG_UIO_PCI_GENERIC=y
 CONFIG_UIO_IVSHMEM=y