[OpenWrt-Devel,ipq,1/2] ipq40xx: Use exact SoC name in A42 DTS name

Message ID 20180313145017.5662-2-sven.eckelmann@openmesh.com
State Accepted, archived
Headers show
Series
  • ipq40xx: OpenMesh A42 adjustments
Related show

Commit Message

Sven Eckelmann March 13, 2018, 2:50 p.m.
The naming scheme of ipq40xx DTS files was adjusted with the switch to the
new IPQ40xx target. This was not done correctly for the OpenMesh A42 which
is actually an IPQ4018 and not an IPQ4019.

Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
---
 .../arch/arm/boot/dts/{qcom-ipq4019-a42.dts => qcom-ipq4018-a42.dts}    | 0
 target/linux/ipq40xx/image/Makefile                                     | 2 +-
 target/linux/ipq40xx/patches-4.14/069-arm-boot-add-dts-files.patch      | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/{qcom-ipq4019-a42.dts => qcom-ipq4018-a42.dts} (100%)

Patch

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-a42.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-a42.dts
similarity index 100%
rename from target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-a42.dts
rename to target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-a42.dts
diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile
index 0c4b971eeb..1abbb404d7 100644
--- a/target/linux/ipq40xx/image/Makefile
+++ b/target/linux/ipq40xx/image/Makefile
@@ -90,7 +90,7 @@  TARGET_DEVICES += meraki_mr33
 
 define Device/openmesh_a42
 	$(call Device/FitImageLzma)
-	DEVICE_DTS := qcom-ipq4019-a42
+	DEVICE_DTS := qcom-ipq4018-a42
 	BLOCKSIZE := 64k
 	SUPPORTED_DEVICES := openmesh,a42
 	DEVICE_TITLE := OpenMesh A42
diff --git a/target/linux/ipq40xx/patches-4.14/069-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-4.14/069-arm-boot-add-dts-files.patch
index 8f0f473e30..b472c122d0 100644
--- a/target/linux/ipq40xx/patches-4.14/069-arm-boot-add-dts-files.patch
+++ b/target/linux/ipq40xx/patches-4.14/069-arm-boot-add-dts-files.patch
@@ -14,8 +14,8 @@  Signed-off-by: John Crispin <john@phrozen.org>
  	qcom-apq8074-dragonboard.dtb \
  	qcom-apq8084-ifc6540.dtb \
  	qcom-apq8084-mtp.dtb \
++	qcom-ipq4018-a42.dtb \
 +	qcom-ipq4018-rt-ac58u.dtb \
-+	qcom-ipq4019-a42.dtb \
  	qcom-ipq4019-ap.dk01.1-c1.dtb \
 +	qcom-ipq4019-ap.dk04.1-c1.dtb \
 +	qcom-ipq4019-fritz4040.dtb \