From: Luis Araneda <luaraneda@gmail.com>
Date: Sat, 1 Sep 2018 05:36:09 +0000 (-0300)
Subject: zynq: rename zedboard with correct manufacturer
X-Git-Tag: v19.07.0-rc1~2618
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=192838e018d526a51ff8908aebaf9ce07e210dca;p=oweals%2Fopenwrt.git

zynq: rename zedboard with correct manufacturer

The board is made by Avnet, so rename it accordingly as
upstream has done it

Also move the device to maintain alphabetic order

Signed-off-by: Luis Araneda <luaraneda@gmail.com>
---

diff --git a/target/linux/zynq/base-files/etc/board.d/02_network b/target/linux/zynq/base-files/etc/board.d/02_network
index 68ff80788a..b3670cf37b 100755
--- a/target/linux/zynq/base-files/etc/board.d/02_network
+++ b/target/linux/zynq/base-files/etc/board.d/02_network
@@ -6,10 +6,10 @@
 board_config_update
 
 case "$(board_name)" in
+avnet,zynq-zed | \
 digilent,zynq-zybo | \
 digilent,zynq-zybo-z7 | \
-xlnx,zynq-zc702 | \
-xlnx,zynq-zed)
+xlnx,zynq-zc702)
 	ucidef_set_interface_lan 'eth0'
 	;;
 *)
diff --git a/target/linux/zynq/image/Makefile b/target/linux/zynq/image/Makefile
index 92174db19a..aac9953b45 100644
--- a/target/linux/zynq/image/Makefile
+++ b/target/linux/zynq/image/Makefile
@@ -49,6 +49,13 @@ endef
 # Devices
 #################################################
 
+define Device/avnet_zynq-zed
+	$(call Device/FitImageGzip)
+	DEVICE_TITLE := Avnet ZedBoard board
+	DEVICE_DTS := zynq-zed
+endef
+TARGET_DEVICES += avnet_zynq-zed
+
 define Device/digilent_zynq-zybo
 	$(call Device/FitImageGzip)
 	DEVICE_TITLE := ZYBO Development Board
@@ -70,11 +77,4 @@ define Device/xlnx_zynq-zc702
 endef
 TARGET_DEVICES += xlnx_zynq-zc702
 
-define Device/xlnx_zynq-zed
-	$(call Device/FitImageGzip)
-	DEVICE_TITLE := Zed Development Board
-	DEVICE_DTS := zynq-zed
-endef
-TARGET_DEVICES += xlnx_zynq-zed
-
 $(eval $(call BuildImage))
diff --git a/target/linux/zynq/patches-4.14/022-v4.19-dts-set-correct-manufacturer-for-ZedBoard-and-MicroZed.patch b/target/linux/zynq/patches-4.14/022-v4.19-dts-set-correct-manufacturer-for-ZedBoard-and-MicroZed.patch
new file mode 100644
index 0000000000..1f01a0bec6
--- /dev/null
+++ b/target/linux/zynq/patches-4.14/022-v4.19-dts-set-correct-manufacturer-for-ZedBoard-and-MicroZed.patch
@@ -0,0 +1,42 @@
+From ef4c422d167afcd15c8bae1f841ef59334c1f973 Mon Sep 17 00:00:00 2001
+From: Luis Araneda <luaraneda@gmail.com>
+Date: Thu, 12 Jul 2018 00:10:19 -0400
+Subject: [PATCH] ARM: dts: zynq: Set correct manufacturer for ZedBoard and
+ MicroZed boards
+
+Both boards are made by Avnet, Inc. So add an additional
+value to the compatible property
+
+Signed-off-by: Luis Araneda <luaraneda@gmail.com>
+Signed-off-by: Michal Simek <michal.simek@xilinx.com>
+---
+ arch/arm/boot/dts/zynq-microzed.dts | 2 +-
+ arch/arm/boot/dts/zynq-zed.dts      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/boot/dts/zynq-microzed.dts b/arch/arm/boot/dts/zynq-microzed.dts
+index aa4a0b6defb84..574ef22761827 100644
+--- a/arch/arm/boot/dts/zynq-microzed.dts
++++ b/arch/arm/boot/dts/zynq-microzed.dts
+@@ -16,7 +16,7 @@
+ 
+ / {
+ 	model = "Zynq MicroZED Development Board";
+-	compatible = "xlnx,zynq-microzed", "xlnx,zynq-7000";
++	compatible = "avnet,zynq-microzed", "xlnx,zynq-microzed", "xlnx,zynq-7000";
+ 
+ 	aliases {
+ 		ethernet0 = &gem0;
+diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts
+index 252153913a157..cd93009067266 100644
+--- a/arch/arm/boot/dts/zynq-zed.dts
++++ b/arch/arm/boot/dts/zynq-zed.dts
+@@ -16,7 +16,7 @@
+ 
+ / {
+ 	model = "Zynq Zed Development Board";
+-	compatible = "xlnx,zynq-zed", "xlnx,zynq-7000";
++	compatible = "avnet,zynq-zed", "xlnx,zynq-zed", "xlnx,zynq-7000";
+ 
+ 	aliases {
+ 		ethernet0 = &gem0;