summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2016-08-24 01:35:22 +0200
committerJo-Philipp Wich <jo@mein.io>2016-08-24 02:30:35 +0200
commit00e8571f2bf24a9ee38f84b8494c1d653ffdeffe (patch)
tree1ca6b97673a4e952d29df91b6faaca4c666bcca6
parent212c6bd781c2df9b1edcddc7278c9a6fecae44a4 (diff)
downloadmtk-20170518-00e8571f2bf24a9ee38f84b8494c1d653ffdeffe.zip
mtk-20170518-00e8571f2bf24a9ee38f84b8494c1d653ffdeffe.tar.gz
mtk-20170518-00e8571f2bf24a9ee38f84b8494c1d653ffdeffe.tar.bz2
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>
-rw-r--r--target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-r7800.dts (renamed from target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7800.dts)0
-rw-r--r--target/linux/ipq806x/image/Makefile2
-rw-r--r--target/linux/ipq806x/patches-4.4/800-devicetree.patch5
-rw-r--r--target/linux/ipq806x/patches-4.4/801-ARM-dts-qcom-add-Netgear-X4-R7500v2-dts-to-Makefile.patch10
4 files changed, 4 insertions, 13 deletions
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
index 52ca92a..52ca92a 100644
--- 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
diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
index 4515946..8c1064e 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 39f59d3..85f2534 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 57e76d2..0000000
--- 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 \