From patchwork Sat Sep 1 05:36:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Araneda X-Patchwork-Id: 964806 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Owc8FLhk"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rihhc9aB"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 422Q3h6TGcz9sBn for ; Sat, 1 Sep 2018 15:37:29 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=WapyvMbWjpQznWdzf7YcjtaKe7d9j9E3A4hlg0O7KpE=; b=Owc8FLhkF76tXc 719c1rijtjqGZvGffiw3mhuv0okoTPDqyNfaCvXJS2UG21/nTNNcuYGejOnjPrBPYzOD9xEEyU8Y/ LYKsNhyJRDZIBiNClZnJfyRVBzP+fOsp7zS8uB/GQnQQAbtmbNtTZsM8osF+ZpY1M28qxjEw9M4OM 3P8O9xu1LMQlNSlRpHDfnk81Ar4a3RptolZPESvSXf1CgWN70mbQEHEn0Y1p1uKmSpF5lPdt704R9 Tdfw76k92INXL+vkjhJPbDw4N/m7x4wGpf4+meyADpFvluT6VehAwvqlf33LHGcI8mccFhqo5w4TW NYJ0umBPMRq1ylfSeCQg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvyb1-0008Rw-Dp; Sat, 01 Sep 2018 05:37:19 +0000 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fvyam-0008RK-IA for openwrt-devel@lists.openwrt.org; Sat, 01 Sep 2018 05:37:06 +0000 Received: by mail-qt0-x243.google.com with SMTP id r37-v6so16915407qtc.0 for ; Fri, 31 Aug 2018 22:36:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=rVKOPnCy88uByeLRc9b7W0sQbB/gyyvzJ1nKlE22ipM=; b=rihhc9aBK9mIntsijCOVvOunZFwalFN8cOGNj2ox1ygSLMWFP+Nl4EvN/9NK76VmKD TN8L3voem3EJYzPWcbu4GAMJdw3UXdq25PeC7LsMR4j1OIJ2vsjFoXPG7LDhAWsDPFAT YYKHftejhJcBLSFB4fw0b+WyrQwidGXA9hZN9jI0yad89BxzMg1jVfGVrlirU4Ea8C4U xpP1vhKl0tl1CsRGhACPK690OiHNMzR1dpl7oNfZb1j0M+XdLuafpYTd6XdgF60+ijTE vSBltuEdVwohg4y0dF3Vc6mqMDVbKh+K1ReIUVEyuVkaD+Wb8ytiT3D7Gb1oetu7mAUE QgOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=rVKOPnCy88uByeLRc9b7W0sQbB/gyyvzJ1nKlE22ipM=; b=e6AdBaEIhE09zGojpwL0/lF3rQezLv7PiScDq+feq3tSjErBDlIcUWBsV0q0Bqg9pk zazIa2QFPVi40403t6T+E+yd5F0qN4OpD8r5MNq5MPPNhpBIdgiLwhH/5G9EqEaFeHon 8g3OxdelyfNbK+5JtjP9fjrVa08mW5BInKowQ0ZDbqahGKndhPaCtjFJu8lBfb2e9EuC ZtMTkN/+wCbQQiwFNek4kJZJOfXQpDYb99S09rxSWIr/in+yQ0t6aclsm9oMiAZ0ns4u s9XLOh02ZX1mtxrICwCsH+Z/yQDOTf9LX4urzMYFe3GsY5NyE0DIdDE64HQjOEsX0txm vLCA== X-Gm-Message-State: APzg51CWfLRc/Dm1hdaLLGfezVbwmt8MmtUkstNKAGiH6CJeY8M0lRqk 9lkYjdBU/9mTt7vVaXTH/vMmoeQx X-Google-Smtp-Source: ANB0Vda4roxm2fuoQy2wDkzrg204npiwbuZdzPSypg41BrVfi3VfdLFIaqIeFZGDQO4bi1biMutOTw== X-Received: by 2002:a0c:c346:: with SMTP id j6-v6mr18203439qvi.23.1535780212094; Fri, 31 Aug 2018 22:36:52 -0700 (PDT) Received: from localhost.localdomain (186-106-10-159.baf.movistar.cl. [186.106.10.159]) by smtp.gmail.com with ESMTPSA id f184-v6sm6612706qkc.23.2018.08.31.22.36.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Aug 2018 22:36:51 -0700 (PDT) From: Luis Araneda To: openwrt-devel@lists.openwrt.org Date: Sat, 1 Sep 2018 02:36:09 -0300 Message-Id: <20180901053609.3484-1-luaraneda@gmail.com> X-Mailer: git-send-email 2.18.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180831_223704_624900_06155AB7 X-CRM114-Status: GOOD ( 13.31 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400d:c0d:0:0:0:243 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (luaraneda[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [OpenWrt-Devel] [PATCH] zynq: rename zedboard with correct manufacturer X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Luis Araneda MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org 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 --- .../zynq/base-files/etc/board.d/02_network | 4 +- target/linux/zynq/image/Makefile | 14 +++---- ...nufacturer-for-ZedBoard-and-MicroZed.patch | 42 +++++++++++++++++++ 3 files changed, 51 insertions(+), 9 deletions(-) create mode 100644 target/linux/zynq/patches-4.14/022-v4.19-dts-set-correct-manufacturer-for-ZedBoard-and-MicroZed.patch 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 aa98f4bf3b..b9286d4de8 100644 --- a/target/linux/zynq/image/Makefile +++ b/target/linux/zynq/image/Makefile @@ -29,6 +29,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 @@ -50,11 +57,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 +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 +Signed-off-by: Michal Simek +--- + 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;