From e3943b4c50fc39ecdb912b6f641ef358b23b68ea Mon Sep 17 00:00:00 2001 From: Anders Dellien Date: Tue, 10 Aug 2021 15:49:35 +0100 Subject: [PATCH] arm-bsp/tc0: Update kernel configuration to support Android S Android has deprecated ION and moved to dmabuf instead. Update the kernel configuration accordingly. Also, enable "CONFIG_DEVFREQ_THERMAL" as this is required by the GPU libraries Signed-off-by: Anders Dellien Change-Id: I7ee3659792984f71cf818ef175d7e5ecc25c6d93 --- .../linux/linux-arm64-ack-5.10/tc/defconfig | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/defconfig b/meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/defconfig index f16b899b..f8ef55b1 100644 --- a/meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/defconfig +++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack-5.10/tc/defconfig @@ -100,10 +100,10 @@ CONFIG_ARM_SCMI_CPUFREQ=y CONFIG_ARM_TEGRA186_CPUFREQ=y CONFIG_ARM_SCMI_PROTOCOL=y CONFIG_ARM_SCPI_PROTOCOL=y -CONFIG_ARM_FFA_TRANSPORT=y CONFIG_RASPBERRYPI_FIRMWARE=y CONFIG_INTEL_STRATIX10_SERVICE=y CONFIG_INTEL_STRATIX10_RSU=m +CONFIG_ARM_FFA_TRANSPORT=y CONFIG_EFI_CAPSULE_LOADER=y CONFIG_IMX_SCU=y CONFIG_IMX_SCU_PD=y @@ -324,7 +324,6 @@ CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m CONFIG_DM_VERITY=y CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y -CONFIG_DM_VERITY_AVB=y CONFIG_DM_VERITY_FEC=y CONFIG_NETDEVICES=y CONFIG_MACVLAN=m @@ -529,6 +528,7 @@ CONFIG_SENSORS_INA2XX=m CONFIG_SENSORS_INA3221=m CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y CONFIG_CPU_THERMAL=y +CONFIG_DEVFREQ_THERMAL=y CONFIG_THERMAL_EMULATION=y CONFIG_QORIQ_THERMAL=m CONFIG_ROCKCHIP_THERMAL=m @@ -785,6 +785,11 @@ CONFIG_QCOM_HIDMA_MGMT=y CONFIG_QCOM_HIDMA=y CONFIG_RCAR_DMAC=y CONFIG_RENESAS_USB_DMAC=m +CONFIG_DMABUF_HEAPS=y +CONFIG_DMABUF_HEAPS_DEFERRED_FREE=y +CONFIG_DMABUF_HEAPS_PAGE_POOL=y +CONFIG_DMABUF_HEAPS_SYSTEM=y +CONFIG_DMABUF_HEAPS_CMA=y CONFIG_VFIO=y CONFIG_VFIO_PCI=y CONFIG_VIRTIO_PCI=y @@ -794,9 +799,6 @@ CONFIG_XEN_GNTDEV=y CONFIG_XEN_GRANT_DEV_ALLOC=y CONFIG_STAGING=y CONFIG_ASHMEM=y -CONFIG_ION=y -CONFIG_ION_SYSTEM_HEAP=y -CONFIG_ION_CMA_HEAP=y CONFIG_COMMON_CLK_RK808=y CONFIG_COMMON_CLK_SCMI=y CONFIG_COMMON_CLK_SCPI=y @@ -827,8 +829,8 @@ CONFIG_QCOM_HFPLL=y CONFIG_HWSPINLOCK=y CONFIG_HWSPINLOCK_QCOM=y CONFIG_ARM_MHU=y -CONFIG_IMX_MBOX=y CONFIG_ARM_MHU_V2=y +CONFIG_IMX_MBOX=y CONFIG_PLATFORM_MHU=y CONFIG_BCM2835_MBOX=y CONFIG_QCOM_APCS_IPC=y @@ -967,7 +969,6 @@ CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_DEV_FSL_CAAM=m CONFIG_CRYPTO_DEV_QCOM_RNG=m CONFIG_CRYPTO_DEV_HISI_ZIP=m -CONFIG_CMA_SIZE_MBYTES=256 CONFIG_PRINTK_TIME=y CONFIG_DEBUG_INFO=y CONFIG_MAGIC_SYSRQ=y