From fe45f58165ec2e8237a138ed73049dd5852b8fee Mon Sep 17 00:00:00 2001 From: Elliot Berman Date: Wed, 27 Oct 2021 17:11:43 -0700 Subject: [PATCH] ARM: dts: msm: Add prefixes support for dtbs_install Add prefixes for target-grouped dtbs_install. Add DTB_PREFIX support for devicetree project: - "waipio-" for non-overlay Waipio DTBs - "waipio-overlay-" for overlay-supported Waipio DTBs - "kalama-" for non-overlay Kalama DTBs - "kalama-overlay-" for overlay-supported Kalama DTBs - "cinder-" for non-overlay Cinder DTBs - "cinder-overlay-" for overlay-supported Cinder DTBs make DTB_PREFIX=kalama-overlay- dtbs_install Change-Id: I1e5e0aea424e999281da03102e2b078bc423c403 --- qcom/Makefile | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/qcom/Makefile b/qcom/Makefile index 4ccaf9a7..6f0af767 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -7,6 +7,9 @@ add-overlays = $(foreach o,$1,$(foreach b,$2,$(eval $(basename $b)-$(basename $o)-dtbs = $b $o) $(basename $b)-$(basename $o).dtb)) +# kalama-dtb-y is list of DTBs to install when doing non-overlay build +# kalama-overlays-dtb-y is list of DTBs and DTBOs to install when doing overlay-supported build +# see DTB_TYPES from scripts/Makefile.dtbinst and install_dtbs from build.config.msm.common ifneq ($(CONFIG_ARCH_QTI_VM), y) @@ -34,9 +37,11 @@ NOAPQ_WAIPIO_BOARDS += \ waipio-kiwi-mtp-pm8008-overlay.dtbo \ waipio-kiwi-mtp-pm8010-overlay.dtbo -dtb-$(CONFIG_ARCH_WAIPIO) += \ +waipio-dtb-$(CONFIG_ARCH_WAIPIO) += \ $(call add-overlays, $(WAIPIO_BOARDS) $(NOAPQ_WAIPIO_BOARDS),$(WAIPIO_BASE_DTB))\ $(call add-overlays, $(WAIPIO_BOARDS) $(APQ_WAIPIO_BOARDS),$(WAIPIO_APQ_BASE_DTB)) +waipio-overlays-dtb-$(CONFIG_ARCH_WAIPIO) += $(WAIPIO_BOARDS) $(NOAPQ_WAIPIO_BOARDS) $(WAIPIO_BASE_DTB) $(WAIPIO_APQ_BASE_DTB) +dtb-y += $(waipio-dtb-y) KALAMA_BASE_DTB += kalama.dtb @@ -50,21 +55,20 @@ KALAMA_BOARDS += \ NOAPQ_KALAMA_BOARDS += \ kalama-rumi-overlay.dtbo -dtb-$(CONFIG_ARCH_KALAMA) += \ +kalama-dtb-$(CONFIG_ARCH_KALAMA) += \ $(call add-overlays, $(KALAMA_BOARDS) $(NOAPQ_KALAMA_BOARDS),$(KALAMA_BASE_DTB))\ $(call add-overlays, $(KALAMA_BOARDS) $(APQ_KALAMA_BOARDS),$(KALAMA_APQ_BASE_DTB)) +kalama-overlays-dtb-$(CONFIG_ARCH_KALAMA) += $(KALAMA_BOARDS) $(NOAPQ_KALAMA_BOARDS) $(KALAMA_BASE_DTB) $(KALAMA_APQ_BASE_DTB) +dtb-y += $(kalama-dtb-y) -ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) CINDER_BASE_DTB += cinder.dtb CINDER_BOARDS += cinder-rumi-overlay.dtbo \ cinder-idp-overlay.dtbo -dtb-$(CONFIG_ARCH_CINDER) += \ +cinder-dtb-$(CONFIG_ARCH_CINDER) += \ $(call add-overlays, $(CINDER_BOARDS), $(CINDER_BASE_DTB)) -else -dtb-$(CONFIG_ARCH_CINDER) += cinder-rumi.dtb \ - cinder-idp.dtb -endif +cinder-overlays-dtb-$(CONFIG_ARCH_CINDER) += $(CINDER_BASE_DTB) $(CINDER_BOARDS) +dtb-y += $(cinder-dtb-y) endif