From 47ea291ae5883454684be322fdf059cf98787e80 Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Fri, 27 Mar 2020 10:18:41 -0700 Subject: [PATCH] ANDROID: GKI: Add CONFIG_RPMSG to gki_defconfig RPMSG is used on various SoC platforms downstream. Enable the subsystem in the gki_defconfig. This also enables RPMSG_CHAR. Bug: 146449535 Change-Id: Ib4a6e5a438681a9835398cdb8917045191e1fbe6 Signed-off-by: Alistair Delva --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + init/Kconfig.gki | 12 ++++++++++++ 3 files changed, 14 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 57df90d52bd1..a1ceceb9b7f2 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -381,6 +381,7 @@ CONFIG_HWSPINLOCK=y CONFIG_MAILBOX=y CONFIG_IOMMU_LIMIT_IOVA_ALIGNMENT=y CONFIG_ARM_SMMU=y +CONFIG_RPMSG_CHAR=y CONFIG_QCOM_COMMAND_DB=y CONFIG_QCOM_RPMH=y CONFIG_DEVFREQ_GOV_PERFORMANCE=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 0e2676346733..cda1a606539c 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -323,6 +323,7 @@ CONFIG_STAGING=y CONFIG_ASHMEM=y CONFIG_ION=y CONFIG_ION_SYSTEM_HEAP=y +CONFIG_RPMSG_CHAR=y CONFIG_PM_DEVFREQ=y CONFIG_IIO=y CONFIG_IIO_BUFFER=y diff --git a/init/Kconfig.gki b/init/Kconfig.gki index 02271aad9baa..8c2f1890db27 100644 --- a/init/Kconfig.gki +++ b/init/Kconfig.gki @@ -144,6 +144,17 @@ config GKI_HIDDEN_SOC_BUS_CONFIGS If you are not building a kernel to be used for a variety of SoCs and out-of-tree drivers, say N here. +config GKI_HIDDEN_RPMSG_CONFIGS + bool "Hidden RPMSG configuration needed for GKI" + select RPMSG + help + Dummy config option used to enable the hidden RPMSG config. + This configuration is usually only selected by another config + option or a combination of them. + + If you are not building a kernel to be used for a variety of + out-of-kernel build RPMSG drivers, say N here. + # Atrocities needed for # a) building GKI modules in separate tree, or # b) building drivers that are not modularizable @@ -167,6 +178,7 @@ config GKI_HACKS_TO_FIX select GKI_QCOM_CLKS_CONFIGS select GKI_HIDDEN_USB_CONFIGS select GKI_HIDDEN_SOC_BUS_CONFIGS + select GKI_HIDDEN_RPMSG_CONFIGS help Dummy config option used to enable core functionality used by modules that may not be selectable in this config.