ipq806x: squash dts makefile patches into one

Signed-off-by: Roman Yeryomin <roman@advem.lv>

diff --git a/target/linux/ipq806x/patches-4.4/800-devicetree.patch b/target/linux/ipq806x/patches-4.4/800-devicetree.patch
index 92ecc95ce9e9d2d404ef00fdbe174c8f25b83883..85f253429b0a480c61e5c7745408964e37b48e7c 100644 (file)
--- 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,6 +21,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
        qcom-ipq8064-db149.dtb \
 +      qcom-ipq8064-ea8500.dtb \
 +      qcom-ipq8064-r7500.dtb \
++      qcom-ipq8064-r7500v2.dtb \
 +      qcom-ipq8065-r7800.dtb \
        qcom-msm8660-surf.dtb \
        qcom-msm8960-cdp.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 (file)
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 \