From f5e741864495df14d0d7e2ff33cd12e21341d877 Mon Sep 17 00:00:00 2001 From: Elliot Berman Date: Fri, 14 Feb 2020 09:06:39 -0800 Subject: [PATCH 1/3] defconfig: arm64: Add ARCH_QCOM config Add ARCH_QCOM to genericarmv8-64_defconfig. ARCH_QCOM selects GPIOLIB and PINCTRL, so those options get removed from defconfig. Change-Id: I25d7e5e36ecd115679f623ec5cb91a2134da0705 Signed-off-by: Elliot Berman --- arch/arm64/configs/vendor/genericarmv8-64_defconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/configs/vendor/genericarmv8-64_defconfig b/arch/arm64/configs/vendor/genericarmv8-64_defconfig index affe7e0bfd3e..a0d7a5679d83 100644 --- a/arch/arm64/configs/vendor/genericarmv8-64_defconfig +++ b/arch/arm64/configs/vendor/genericarmv8-64_defconfig @@ -32,6 +32,7 @@ CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_SLAB_FREELIST_HARDENED=y # CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set CONFIG_PROFILING=y +CONFIG_ARCH_QCOM=y CONFIG_ARCH_QTI_VM=y CONFIG_ARM64_VA_BITS_48=y CONFIG_SCHED_MC=y @@ -231,10 +232,8 @@ CONFIG_SPI_PL022=y CONFIG_SPI_ROCKCHIP=y CONFIG_SPI_SPIDEV=m CONFIG_SPMI=y -CONFIG_PINCTRL=y CONFIG_PINCTRL_SINGLE=y CONFIG_PINCTRL_MAX77620=y -CONFIG_GPIOLIB=y CONFIG_GPIO_DWAPB=y CONFIG_GPIO_MB86S7X=y CONFIG_GPIO_PL061=y From 710a5ef7f106c0003fd32dab1798cfbcc577c37c Mon Sep 17 00:00:00 2001 From: Elliot Berman Date: Fri, 14 Feb 2020 09:07:23 -0800 Subject: [PATCH 2/3] arm64: Kconfig: Add ARCH_QCOM dependency for ARCH_QTI_VM ARCH_QTI_VM is an ARCH_QCOM platform. Change-Id: Ic5dd9aae9eb2457261d985eb075b2562755fb0d3 Signed-off-by: Elliot Berman --- arch/arm64/Kconfig.platforms | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 6a8d12072286..0da8303a275f 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -196,6 +196,7 @@ config ARCH_LAHAINA config ARCH_QTI_VM bool "Enable Virtual Machines Support for Qualcomm Technologies, Inc." + depends on ARCH_QCOM help This enables support for the Qualcomm Technologies, Inc.'s Virtual Machines. If you wish to build a kernel that doesn't From 10aa2cf5ac24dd49d9451bf63672eb45a0668bdf Mon Sep 17 00:00:00 2001 From: Elliot Berman Date: Fri, 14 Feb 2020 09:38:49 -0800 Subject: [PATCH 3/3] defconfig: arm64: Enable QCOM_SCM driver Enable QCOM_SCM driver on genericarmv8-64_defconfig. Change-Id: I238739b4d421644ee3ce96d17c1f8adb4047579d Signed-off-by: Elliot Berman --- arch/arm64/configs/vendor/genericarmv8-64_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/configs/vendor/genericarmv8-64_defconfig b/arch/arm64/configs/vendor/genericarmv8-64_defconfig index a0d7a5679d83..e4278ea63cd1 100644 --- a/arch/arm64/configs/vendor/genericarmv8-64_defconfig +++ b/arch/arm64/configs/vendor/genericarmv8-64_defconfig @@ -46,6 +46,8 @@ CONFIG_HIBERNATION=y CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y CONFIG_ARM_CPUIDLE=y CONFIG_ARM_PSCI_CPUIDLE=y +CONFIG_QCOM_SCM=y +CONFIG_QTEE_SHM_BRIDGE=y CONFIG_EFI_CAPSULE_LOADER=y CONFIG_ACPI=y # CONFIG_ACPI_AC is not set