From 1156d6492da8076afd373abe4149dbf3595e5ca3 Mon Sep 17 00:00:00 2001 From: Yue Liu Date: Tue, 25 Oct 2022 15:33:06 +0800 Subject: [PATCH] ARM: dts: msm: update Makefile for Ravelin Ravelin supports Virtual Machines, and need to disable CONFIG_ARCH_QTI_VM when build pvm, so adding ravelin related parameter to the branch of CONFIG_ARCH_QTI_VM is not Y. Change-Id: Id20545de91d8e305590799f4b7a78e13c5e61289 --- qcom/Makefile | 86 +++++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/qcom/Makefile b/qcom/Makefile index 96288e39..59632c42 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -486,6 +486,49 @@ dtb-$(CONFIG_ARCH_SHIMA) += shima-rumi.dtb \ shima-idps-digital-mics.dtb endif +ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) +dtbo-$(CONFIG_ARCH_RAVELIN) += ravelin-rumi-overlay.dtbo \ + ravelin-atp-overlay.dtbo \ + ravelin-idp-overlay.dtbo \ + ravelin-qrd-overlay.dtbo \ + ravelin-idp-4gb-overlay.dtbo \ + ravelin-qrd-4gb-overlay.dtbo \ + montague-rumi-overlay.dtbo \ + montague-qrd-overlay.dtbo \ + montague-hsp-overlay.dtbo \ + montague-moselle-overlay.dtbo \ + montague-rcm-overlay.dtbo + +ravelin-rumi-overlay.dtbo-base := ravelin.dtb +ravelin-atp-overlay.dtbo-base := ravelin.dtb +ravelin-idp-overlay.dtbo-base := ravelin.dtb +ravelin-qrd-overlay.dtbo-base := ravelin.dtb +ravelin-idp-4gb-overlay.dtbo-base := ravelin-4gb.dtb +ravelin-qrd-4gb-overlay.dtbo-base := ravelin-4gb.dtb +montague-rumi-overlay.dtbo-base := montague.dtb montaguep.dtb +montague-qrd-overlay.dtbo-base := montague.dtb montaguep.dtb +montague-hsp-overlay.dtbo-base := montague.dtb montaguep.dtb +montague-moselle-overlay.dtbo-base := montague.dtb montaguep.dtb +montague-rcm-overlay.dtbo-base := montague.dtb montaguep.dtb +else +dtb-$(CONFIG_ARCH_RAVELIN) += ravelin-rumi.dtb \ + ravelin-atp.dtb \ + ravelin-idp.dtb \ + ravelin-qrd.dtb \ + ravelin-idp-4gb.dtb \ + ravelin-qrd-4gb.dtb \ + montague-rumi.dtb \ + montague-qrd.dtb \ + montague-hsp.dtb \ + montague-moselle.dtb \ + montague-rcm.dtb \ + montaguep-rumi.dtb \ + montaguep-qrd.dtb \ + montaguep-hsp.dtb \ + montaguep-moselle.dtb \ + montaguep-rcm.dtb +endif + ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) dtbo-$(CONFIG_ARCH_SM8150) += \ sm8150-cdp-overlay.dtbo \ @@ -535,49 +578,6 @@ dtb-$(CONFIG_ARCH_ANORAK) += anorak-rumi.dtb \ anorak-idp-sd.dtb endif -ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) -dtbo-$(CONFIG_ARCH_RAVELIN) += ravelin-rumi-overlay.dtbo \ - ravelin-atp-overlay.dtbo \ - ravelin-idp-overlay.dtbo \ - ravelin-qrd-overlay.dtbo \ - ravelin-idp-4gb-overlay.dtbo \ - ravelin-qrd-4gb-overlay.dtbo \ - montague-rumi-overlay.dtbo \ - montague-qrd-overlay.dtbo \ - montague-hsp-overlay.dtbo \ - montague-moselle-overlay.dtbo \ - montague-rcm-overlay.dtbo - -ravelin-rumi-overlay.dtbo-base := ravelin.dtb -ravelin-atp-overlay.dtbo-base := ravelin.dtb -ravelin-idp-overlay.dtbo-base := ravelin.dtb -ravelin-qrd-overlay.dtbo-base := ravelin.dtb -ravelin-idp-4gb-overlay.dtbo-base := ravelin-4gb.dtb -ravelin-qrd-4gb-overlay.dtbo-base := ravelin-4gb.dtb -montague-rumi-overlay.dtbo-base := montague.dtb montaguep.dtb -montague-qrd-overlay.dtbo-base := montague.dtb montaguep.dtb -montague-hsp-overlay.dtbo-base := montague.dtb montaguep.dtb -montague-moselle-overlay.dtbo-base := montague.dtb montaguep.dtb -montague-rcm-overlay.dtbo-base := montague.dtb montaguep.dtb -else -dtb-$(CONFIG_ARCH_RAVELIN) += ravelin-rumi.dtb \ - ravelin-atp.dtb \ - ravelin-idp.dtb \ - ravelin-qrd.dtb \ - ravelin-idp-4gb.dtb \ - ravelin-qrd-4gb.dtb \ - montague-rumi.dtb \ - montague-qrd.dtb \ - montague-hsp.dtb \ - montague-moselle.dtb \ - montague-rcm.dtb \ - montaguep-rumi.dtb \ - montaguep-qrd.dtb \ - montaguep-hsp.dtb \ - montaguep-moselle.dtb \ - montaguep-rcm.dtb -endif - ifeq ($(CONFIG_ARCH_LAHAINA), y) ifeq ($(CONFIG_ARCH_QTI_VM), y) dtb-$(CONFIG_ARCH_QTI_VM) += lahaina-vm-mtp.dtb \