Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64b50f2e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I46ced825,Idca1c579 into msm-4.14 

* changes:
  ARM: dts: msm: change device tree overlay support for SDM855
  scripts: Makefile: Add multi overlay dtbo-base apply verify
parents a1547c48 d4c22deb

arch/arm64/boot/dts/qcom/Makefile

+6 −14
Original line number Diff line number Diff line
@@ -16,23 +16,15 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sdm855-mtp-overlay.dtbo \

		sdm855-rumi-overlay.dtbo \

		sdm855-qrd-overlay.dtbo \

		sdm855-v2-cdp-overlay.dtbo \

		sdm855-v2-mtp-overlay.dtbo \

		sdm855-v2-rumi-overlay.dtbo \

		sdm855-v2-qrd-overlay.dtbo \

		sdm855-sdx50m-cdp-overlay.dtbo \

		sdm855-sdx50m-mtp-overlay.dtbo



sdm855-cdp-overlay.dtbo-base := sdm855.dtb

sdm855-mtp-overlay.dtbo-base := sdm855.dtb

sdm855-rumi-overlay.dtbo-base := sdm855.dtb

sdm855-qrd-overlay.dtbo-base := sdm855.dtb

sdm855-v2-cdp-overlay.dtbo-base := sdm855-v2.dtb

sdm855-v2-mtp-overlay.dtbo-base := sdm855-v2.dtb

sdm855-v2-rumi-overlay.dtbo-base := sdm855-v2.dtb

sdm855-v2-qrd-overlay.dtbo-base := sdm855-v2.dtb

sdm855-sdx50m-cdp-overlay.dtbo-base := sdm855.dtb

sdm855-sdx50m-mtp-overlay.dtbo-base := sdm855.dtb

sdm855-cdp-overlay.dtbo-base := sdm855.dtb sdm855-v2.dtb

sdm855-mtp-overlay.dtbo-base := sdm855.dtb sdm855-v2.dtb

sdm855-rumi-overlay.dtbo-base := sdm855.dtb sdm855-v2.dtb

sdm855-qrd-overlay.dtbo-base := sdm855.dtb sdm855-v2.dtb

sdm855-sdx50m-cdp-overlay.dtbo-base := sdm855.dtb sdm855-v2.dtb

sdm855-sdx50m-mtp-overlay.dtbo-base := sdm855.dtb sdm855-v2.dtb

else

dtb-$(CONFIG_ARCH_SDM855)	+= sdm855-rumi.dtb \

	sdm855-mtp.dtb \

arch/arm64/boot/dts/qcom/sdm855-cdp-overlay.dts

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ 
#include "sdm855-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM855 v1 CDP";

	model = "CDP";

	compatible = "qcom,sdm855-cdp", "qcom,sdm855", "qcom,cdp";

	qcom,msm-id = <339 0x0>;

	qcom,board-id = <1 0>;

};

arch/arm64/boot/dts/qcom/sdm855-mtp-overlay.dts

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ 
#include "sdm855-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM855 v1 MTP";

	model = "MTP";

	compatible = "qcom,sdm855-mtp", "qcom,sdm855", "qcom,mtp";

	qcom,msm-id = <339 0x0>;

	qcom,board-id = <8 0>;

};

arch/arm64/boot/dts/qcom/sdm855-qrd-overlay.dts

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ 
#include "sdm855-qrd.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM855 v1 QRD";

	model = "QRD";

	compatible = "qcom,sdm855-qrd", "qcom,sdm855", "qcom,qrd";

	qcom,msm-id = <339 0x0>;

	qcom,board-id = <11 0>;

};

arch/arm64/boot/dts/qcom/sdm855-rumi-overlay.dts

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ 
#include "sdm855-rumi.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM855 v1 RUMI";

	model = "RUMI";

	compatible = "qcom,sdm855-rumi", "qcom,sdm855", "qcom,rumi";

	qcom,msm-id = <339 0x0>;

	qcom,board-id = <15 0>;

};