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

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

Merge "defconfig: msm: Add qm215 support in 8937 configure"

parents 20e24506 dac7c9a3

arch/arm/configs/msm8937-perf_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -58,6 +58,7 @@ CONFIG_PARTITION_ADVANCED=y 
CONFIG_ARCH_QCOM=y

CONFIG_ARCH_QCOM=y

CONFIG_ARCH_MSM8937=y

CONFIG_ARCH_MSM8937=y

CONFIG_ARCH_MSM8917=y

CONFIG_ARCH_MSM8917=y

CONFIG_ARCH_QM215=y

CONFIG_ARCH_SDM439=y

CONFIG_ARCH_SDM439=y

CONFIG_ARCH_SDM429=y

CONFIG_ARCH_SDM429=y

# CONFIG_VDSO is not set

# CONFIG_VDSO is not set

arch/arm/configs/msm8937_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -60,6 +60,7 @@ CONFIG_PARTITION_ADVANCED=y 
CONFIG_ARCH_QCOM=y

CONFIG_ARCH_QCOM=y

CONFIG_ARCH_MSM8937=y

CONFIG_ARCH_MSM8937=y

CONFIG_ARCH_MSM8917=y

CONFIG_ARCH_MSM8917=y

CONFIG_ARCH_QM215=y

CONFIG_ARCH_SDM439=y

CONFIG_ARCH_SDM439=y

CONFIG_ARCH_SDM429=y

CONFIG_ARCH_SDM429=y

# CONFIG_VDSO is not set

# CONFIG_VDSO is not set

arch/arm/configs/msm8937go-perf_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -59,6 +59,7 @@ CONFIG_PARTITION_ADVANCED=y 
CONFIG_ARCH_QCOM=y

CONFIG_ARCH_QCOM=y

CONFIG_ARCH_MSM8937=y

CONFIG_ARCH_MSM8937=y

CONFIG_ARCH_MSM8917=y

CONFIG_ARCH_MSM8917=y

CONFIG_ARCH_QM215=y

CONFIG_ARCH_SDM439=y

CONFIG_ARCH_SDM439=y

CONFIG_ARCH_SDM429=y

CONFIG_ARCH_SDM429=y

# CONFIG_VDSO is not set

# CONFIG_VDSO is not set

arch/arm/configs/msm8937go_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -61,6 +61,7 @@ CONFIG_PARTITION_ADVANCED=y 
CONFIG_ARCH_QCOM=y

CONFIG_ARCH_QCOM=y

CONFIG_ARCH_MSM8937=y

CONFIG_ARCH_MSM8937=y

CONFIG_ARCH_MSM8917=y

CONFIG_ARCH_MSM8917=y

CONFIG_ARCH_QM215=y

CONFIG_ARCH_SDM439=y

CONFIG_ARCH_SDM439=y

CONFIG_ARCH_SDM429=y

CONFIG_ARCH_SDM429=y

# CONFIG_VDSO is not set

# CONFIG_VDSO is not set

arch/arm64/boot/dts/qcom/Makefile

+6 −4
Original line number Original line Diff line number Diff line
@@ -343,8 +343,9 @@ dtbo-$(CONFIG_ARCH_MSM8917) += msm8917-mtp-overlay.dtbo \ 
	msm8917-rcm-overlay.dtbo \

	msm8917-rcm-overlay.dtbo \

	apq8017-mtp-overlay.dtbo \

	apq8017-mtp-overlay.dtbo \

	apq8017-cdp-overlay.dtbo \

	apq8017-cdp-overlay.dtbo \

	apq8017-cdp-wcd-rome-overlay.dtbo \

	apq8017-cdp-wcd-rome-overlay.dtbo

	qm215-qrd-overlay.dtbo



dtbo-$(CONFIG_ARCH_QM215) +=qm215-qrd-overlay.dtbo





dtbo-$(CONFIG_ARCH_MSM8953) += msm8953-mtp-overlay.dtbo \

dtbo-$(CONFIG_ARCH_MSM8953) += msm8953-mtp-overlay.dtbo \

	msm8953-cdp-overlay.dtbo \

	msm8953-cdp-overlay.dtbo \
@@ -544,8 +545,9 @@ dtb-$(CONFIG_ARCH_MSM8917) += msm8917-pmi8950-mtp.dtb \ 
	apq8017-pmi8937-cdp-wcd-rome.dtb \

	apq8017-pmi8937-cdp-wcd-rome.dtb \

	msm8917-pmi8940-mtp.dtb \

	msm8917-pmi8940-mtp.dtb \

	msm8917-pmi8940-cdp.dtb \

	msm8917-pmi8940-cdp.dtb \

	msm8917-pmi8940-rcm.dtb \

	msm8917-pmi8940-rcm.dtb

	qm215-qrd.dtb



dtb-$(CONFIG_ARCH_QM215) += qm215-qrd.dtb





dtb-$(CONFIG_ARCH_MSM8909) += sdw3100-msm8909w-wtp.dtb \

dtb-$(CONFIG_ARCH_MSM8909) += sdw3100-msm8909w-wtp.dtb \

	sdw3100-apq8009w-wtp.dtb \

	sdw3100-apq8009w-wtp.dtb \