From 4eba18c97ff2f6dc294818311456a9b720fef444 Mon Sep 17 00:00:00 2001 From: Murali Nalajala Date: Wed, 25 Mar 2020 18:57:41 -0700 Subject: [PATCH] ARM: dts: msm: do not compile Non-VM specific DT files Do not compile platform specific DT files if the VM configs are defined. Compiling platform specific DT files for VMs which are required lead to compilation errors. Change-Id: Id47ab2f2cf77a5a04deadbcc0a3e4d31b5e51989 --- qcom/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/qcom/Makefile b/qcom/Makefile index 214919f7..e5bb5b21 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -1,3 +1,4 @@ +ifneq ($(CONFIG_ARCH_QTI_VM), y) ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) dtbo-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi-overlay.dtbo \ lahaina-mtp-overlay.dtbo \ @@ -33,8 +34,6 @@ dtb-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi.dtb \ lahainap-qrd.dtb endif -dtb-$(CONFIG_ARCH_QTI_VM) += trustedvm.dtb - ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) dtbo-$(CONFIG_ARCH_SHIMA) += \ shima-rumi-overlay.dtbo @@ -66,6 +65,13 @@ dtb-$(CONFIG_ARCH_SM8150) += sm8150-cdp.dtb \ sa8155-v2-adp-air.dtb \ sa8155p-v2-adp-air.dtb endif +endif + +ifeq ($(CONFIG_ARCH_LAHAINA), y) +ifeq ($(CONFIG_ARCH_QTI_VM), y) +dtb-$(CONFIG_ARCH_QTI_VM) += trustedvm.dtb +endif +endif always := $(dtb-y) subdir-y := $(dts-dirs)