From 00e8571f2bf24a9ee38f84b8494c1d653ffdeffe Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 24 Aug 2016 01:35:22 +0200
Subject: [PATCH] ipq806x: rename R7800 device tree file, merge R7500v2 dts
addition
The R7800 is an IPQ8065, so rename its dts file to reflect that fact.
Also fold the R7500v2 dts addition into the existing 800-devicetree.patch.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---
.../{qcom-ipq8064-r7800.dts => qcom-ipq8065-r7800.dts} | 0
target/linux/ipq806x/image/Makefile | 2 +-
target/linux/ipq806x/patches-4.4/800-devicetree.patch | 5 +++--
...s-qcom-add-Netgear-X4-R7500v2-dts-to-Makefile.patch | 10 ----------
4 files changed, 4 insertions(+), 13 deletions(-)
rename target/linux/ipq806x/files/arch/arm/boot/dts/{qcom-ipq8064-r7800.dts => qcom-ipq8065-r7800.dts} (100%)
delete mode 100644 target/linux/ipq806x/patches-4.4/801-ARM-dts-qcom-add-Netgear-X4-R7500v2-dts-to-Makefile.patch
diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7800.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
similarity index 100%
rename from target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7800.dts
rename to target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
index 45159462cc..8c1064e552 100644
--- a/target/linux/ipq806x/image/Makefile
+++ b/target/linux/ipq806x/image/Makefile
@@ -190,7 +190,7 @@ endef
define Device/R7800
$(call Device/DniImage)
- DEVICE_DTS := qcom-ipq8064-r7800
+ DEVICE_DTS := qcom-ipq8065-r7800
KERNEL_SIZE := 2097152
NETGEAR_BOARD_ID := R7800
NETGEAR_HW_ID := 29764958+0+128+512+4x4+4x4+cascade
diff --git a/target/linux/ipq806x/patches-4.4/800-devicetree.patch b/target/linux/ipq806x/patches-4.4/800-devicetree.patch
index 39f59d36c8..85f253429b 100644
--- a/target/linux/ipq806x/patches-4.4/800-devicetree.patch
+++ b/target/linux/ipq806x/patches-4.4/800-devicetree.patch
@@ -12,7 +12,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
-@@ -506,7 +506,12 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+@@ -506,7 +506,13 @@ dtb-$(CONFIG_ARCH_QCOM) += \
qcom-apq8084-ifc6540.dtb \
qcom-apq8084-mtp.dtb \
qcom-ipq8064-ap148.dtb \
@@ -21,7 +21,8 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
qcom-ipq8064-db149.dtb \
+ qcom-ipq8064-ea8500.dtb \
+ qcom-ipq8064-r7500.dtb \
-+ qcom-ipq8064-r7800.dtb \
++ qcom-ipq8064-r7500v2.dtb \
++ qcom-ipq8065-r7800.dtb \
qcom-msm8660-surf.dtb \
qcom-msm8960-cdp.dtb \
qcom-msm8974-sony-xperia-honami.dtb
diff --git a/target/linux/ipq806x/patches-4.4/801-ARM-dts-qcom-add-Netgear-X4-R7500v2-dts-to-Makefile.patch b/target/linux/ipq806x/patches-4.4/801-ARM-dts-qcom-add-Netgear-X4-R7500v2-dts-to-Makefile.patch
deleted file mode 100644
index 57e76d224f..0000000000
--- a/target/linux/ipq806x/patches-4.4/801-ARM-dts-qcom-add-Netgear-X4-R7500v2-dts-to-Makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -511,6 +511,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \
- qcom-ipq8064-db149.dtb \
- qcom-ipq8064-ea8500.dtb \
- qcom-ipq8064-r7500.dtb \
-+ qcom-ipq8064-r7500v2.dtb \
- qcom-ipq8064-r7800.dtb \
- qcom-msm8660-surf.dtb \
- qcom-msm8960-cdp.dtb \
--
GitLab