From 39f48f66f74cdfa79f254376442a07663ab58335 Mon Sep 17 00:00:00 2001 From: Ulises Mendez Martinez Date: Thu, 1 Sep 2022 21:46:32 +0000 Subject: [PATCH] ANDROID: GKI: Add GKI_HIDDEN_MCP251XFD_CONFIGS * It also adds INTERCONNECT_QCOM under GKI_HIDDEN_DRM_CONFIGS * Short term solution needed for building the following drivers that are not modularizable: * drivers/net/can/spi/mcp251xfd/mcp251xfd.ko * drivers/interconnect/qcom/icc-rpmh.ko * drivers/interconnect/qcom/qnoc-sm8450.ko * It adds two objects to the common kernel: $ find -name rx-offload.o __common_kernel_aarch64/drivers/net/can/dev/rx-offload.o $ find -name icc-common.o __common_kernel_aarch64/drivers/interconnect/qcom/icc-common.o Bug: 233404531 Signed-off-by: Ulises Mendez Martinez Change-Id: Idac61705c360dfde8683b685b8c291f293657d11 --- init/Kconfig.gki | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/init/Kconfig.gki b/init/Kconfig.gki index 4f1481cbc095..684db586237e 100644 --- a/init/Kconfig.gki +++ b/init/Kconfig.gki @@ -12,6 +12,14 @@ config GKI_HIDDEN_DRM_CONFIGS These are normally selected implicitly when including a DRM module, but for GKI, the modules are built out-of-tree. +config GKI_HIDDEN_MCP251XFD_CONFIGS + bool "Hidden MCP251XFD configs needed for GKI" + select CAN_RX_OFFLOAD + help + Dummy config option used to enable hidden MCP251XFD configs. + These are normally selected implicitly when including a + MCP251XFD module, but for GKI, the modules are built out-of-tree. + config GKI_HIDDEN_REGMAP_CONFIGS bool "Hidden Regmap configs needed for GKI" select REGMAP_IRQ @@ -76,6 +84,7 @@ config GKI_HIDDEN_QCOM_CONFIGS select QCOM_SMEM_STATE select QCOM_GDSC if (ARCH_QCOM) select IOMMU_IO_PGTABLE_LPAE if (ARCH_QCOM) + select INTERCONNECT_QCOM if (ARCH_QCOM) help Dummy config option used to enable hidden QCOM configs. @@ -235,6 +244,7 @@ config GKI_HACKS_TO_FIX bool "GKI Dummy config options" select GKI_HIDDEN_CRYPTO_CONFIGS select GKI_HIDDEN_DRM_CONFIGS + select GKI_HIDDEN_MCP251XFD_CONFIGS select GKI_HIDDEN_REGMAP_CONFIGS select GKI_HIDDEN_SND_CONFIGS select GKI_HIDDEN_SND_SOC_CONFIGS