From 2ef5b1a295d50bf1fb177af55e5d43730f04c5bd Mon Sep 17 00:00:00 2001 From: Martin Ayotte Date: Sun, 7 May 2017 14:23:41 -0400 Subject: [PATCH] re-enable DTS patches after fixing Makefile collisions in 4.11 --- .../{unresolved => }/add_orangepi-zero-plus-h5.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename patch/kernel/sun50i-dev/{unresolved => }/add_orangepi-zero-plus-h5.patch (97%) diff --git a/patch/kernel/sun50i-dev/unresolved/add_orangepi-zero-plus-h5.patch b/patch/kernel/sun50i-dev/add_orangepi-zero-plus-h5.patch similarity index 97% rename from patch/kernel/sun50i-dev/unresolved/add_orangepi-zero-plus-h5.patch rename to patch/kernel/sun50i-dev/add_orangepi-zero-plus-h5.patch index 6da831cdb5..e8626e5c79 100644 --- a/patch/kernel/sun50i-dev/unresolved/add_orangepi-zero-plus-h5.patch +++ b/patch/kernel/sun50i-dev/add_orangepi-zero-plus-h5.patch @@ -2,12 +2,12 @@ diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwin index 244e8b7..849ea91 100644 --- a/arch/arm64/boot/dts/allwinner/Makefile +++ b/arch/arm64/boot/dts/allwinner/Makefile -@@ -1,7 +1,8 @@ - dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-bananapi-m64.dtb +@@ -4,7 +4,8 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pine64-plus.dtb sun50i-a64-pine64.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb +dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zeroplus.dtb - dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi2.dtb + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo2.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopim1plus2.dtb always := $(dtb-y)