From patchwork Fri Mar 23 14:38:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 890014 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=monstr.eu Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="lkFnDOdB"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 4075pG41zjz9s1B for ; Sat, 24 Mar 2018 01:41:42 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 17E2CC21DDC; Fri, 23 Mar 2018 14:41:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 3657FC21DE8; Fri, 23 Mar 2018 14:41:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D562DC21DE8; Fri, 23 Mar 2018 14:38:48 +0000 (UTC) Received: from mail-wr0-f177.google.com (mail-wr0-f177.google.com [209.85.128.177]) by lists.denx.de (Postfix) with ESMTPS id 0FF35C21E08 for ; Fri, 23 Mar 2018 14:38:48 +0000 (UTC) Received: by mail-wr0-f177.google.com with SMTP id p53so4854684wrc.10 for ; Fri, 23 Mar 2018 07:38:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=reply-to:to:from:subject:message-id:date:user-agent:mime-version; bh=CV56fuhoYm4W+JXs1nQSsLKnlXRCNB07fOvTHkXIpaQ=; b=lkFnDOdB/Fix3lSFogyiZl9T40bO/TufnzIZNPQNhwxiQvbSh7xKdN7sbL3XYfU0FH Yd637sEDfqu/JJzBOZZTn22o62nZcd+wXUmTZrwQ2QdhdnXb2hbk0+8QVw6P6oPl9R6Z P0JcAyA+HQokRmmFdezUXiZuHtNGD7tplLaL130V2NCwH/43WVj33TL1744UNlojnoKR EwDJVj/f2+j06c/KkduW/+wxCn1Ke8wkDwWrGUgz5UtgveliEQNeeRR7oIHkvkvKcZKc vYightQkDLN9WVuaxw0SI89LGXEdKkO2WVQjDl6K1j3q03Fi56j0MJJ06z0D1u1+Hy6Y x3pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:reply-to:to:from:subject:message-id:date :user-agent:mime-version; bh=CV56fuhoYm4W+JXs1nQSsLKnlXRCNB07fOvTHkXIpaQ=; b=FZx8mItWETzvEO1Md8sMYSJBUCsyZOMm+ClUwWOy5cbwJRhjvWubHYFLjtU8XZq6jh 0Gz4hMp8Ojyp9I3aOm3z2SRXSiClLLzII5yQ6XYmRK9BViW5Dw2Fn3MfOnT393XL4Ju8 raftwGz1HIfg2QT2/hPP5O86icjoQHbWeGCgEp/qCDngHb2WWSpSXBOhwMzAiQWnJRwX 5fqkvpzqbcHWHXeYTttl5d4KYiEqQvylevPxnaM9nMp0F9qb7XNm7YRSulDB07leitpy 6YXinWYbs1dXrM5pttjhHtMwW0fBhStw98yMG+xZ3Cu/KOnIJuzN7hdbT+oU0bzrPac6 NFiQ== X-Gm-Message-State: AElRT7Eu4C+UtWh5v7tcPdJITXAsIRrvMpx3uMUlln/R4R9MW8Jlybmz OkqoHxdYityltyR1RtTjoIROw565 X-Google-Smtp-Source: AG47ELtcvcmKu+RX2FiDNtoJx2ozftSkHSG+sC7ubnzHcozIouykGD8nxjH5/jxawWAPrlXcSknczg== X-Received: by 10.223.167.12 with SMTP id c12mr15855479wrd.194.1521815927611; Fri, 23 Mar 2018 07:38:47 -0700 (PDT) Received: from [66.102.1.109] ([149.199.62.254]) by smtp.gmail.com with ESMTPSA id c141sm8007962wmh.21.2018.03.23.07.38.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Mar 2018 07:38:46 -0700 (PDT) To: Tom Rini , "u-boot@lists.denx.de" From: Michal Simek Message-ID: Date: Fri, 23 Mar 2018 15:38:41 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 X-Content-Filtered-By: Mailman/MimeDel 2.1.18 Subject: [U-Boot] [GIT PULL] Xilinx patches for v2018.05 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: monstr@monstr.eu Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Hi Tom, please pull these changes to your tree. Travis looks good. https://travis-ci.org/michalsimek/u-boot/builds/357294420 And buildman output too. Thanks, Michal The following changes since commit b0af10443afcb9e0dcfe18a7b8a013b230df9e39: Merge git://git.denx.de/u-boot-net (2018-03-22 16:35:43 -0400) are available in the git repository at: git://www.denx.de/git/u-boot-microblaze.git tags/xilinx-for-v2018.05 for you to fetch changes up to 8ae3d0b50cd22aebcd87022dc357d1cf0f3a879b: MAINTAINERS: Fix Zynq/ZynqMP and Microblaze fragments (2018-03-23 09:36:15 +0100) ---------------------------------------------------------------- Xilinx changes for v2018.05 - Fix mkimage recognition - Update all my fragments ZynqMP: - Use clk driver - Support loading elfs in el1 - Various DTS and defconfig changes - Enable newer pmufw versions - Support more clocks - Remove ep108 - Secure image support - Fix memtest setup Zynq: - Enabling watchdog driver - Support more clocks - defconfig changes fpga: - Simplify error path net: - GMII case update ---------------------------------------------------------------- Michal Simek (13): arm64: zynqmp: Convert board to use zynqmp-clk driver xilinx: Sync defconfigs with latest Kconfig updates fpga: Simplify error path in fpga_add arm64: zynqmp: Enable ethernet driver for zc1751-dc5 arm64: zynqmp: Enable newer pmufw versions clk: zynq: Show watchdog clock rate properly arm: zynq: Wire watchdog internals arm: zynq: Enable cadence driver on zc706 arm: zynq: Setup the same bootcommand as for zc770 xm011 x8 arm: zynq: Remove OF_EMBED configuration for zc770 xm011 x16 arm64: zynqmp: Remove ep108 board tools: xilinx: Fix zynq/zynqmp image recognition MAINTAINERS: Fix Zynq/ZynqMP and Microblaze fragments Nitin Jain (1): arm64: zynqmp: Add support to load an app at EL1 Shreenidhi Shedi (1): watchdog: Add Cadence watchdog driver Siva Durga Prasad Paladugu (4): arm: zynq: Enable debug uart on Zedboard net: zynq_gem: Dont run any phy detection logic for GMII case arm64: zynqmp: Correct EG/EV part detection logic arm64: zynqmp: Add support for verifying secure images Vipul Kumar (3): arm64: zynqmp: Changed scratch address used by the alternate memory test arm64: zynqmp: nand: Fixed NAND erase issue for size 1GiB or more arm64: zynqmp: Print the value of pl clocks and wdt clock using clk dump MAINTAINERS | 52 ++++++++++++++-- arch/arm/Kconfig | 2 + arch/arm/cpu/armv8/zynqmp/cpu.c | 2 +- arch/arm/dts/Makefile | 1 - arch/arm/dts/zynq-zc706.dts | 4 ++ arch/arm/dts/zynqmp-clk-ccf.dtsi | 290 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/zynqmp-ep108-clk.dtsi | 172 ---------------------------------------------------- arch/arm/dts/zynqmp-ep108.dts | 235 ---------------------------------------------------------------------- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts | 2 +- arch/arm/dts/zynqmp-zcu102-revA.dts | 2 +- arch/arm/include/asm/arch-zynqmp/sys_proto.h | 2 + board/xilinx/zynq/MAINTAINERS | 1 + board/xilinx/zynq/board.c | 49 +++++++++++++++ board/xilinx/zynqmp/Kconfig | 18 ++++++ board/xilinx/zynqmp/MAINTAINERS | 1 + board/xilinx/zynqmp/Makefile | 4 ++ board/xilinx/zynqmp/cmds.c | 105 ++++++++++++++++++++++++++++++++ board/xilinx/zynqmp/zynqmp.c | 67 ++++++++++++++++---- configs/microblaze-generic_defconfig | 2 +- configs/syzygy_hub_defconfig | 2 +- configs/topic_miami_defconfig | 2 +- configs/topic_miamilite_defconfig | 2 +- configs/topic_miamiplus_defconfig | 2 +- configs/xilinx_zynqmp_ep_defconfig | 102 ------------------------------- configs/xilinx_zynqmp_mini_emmc_defconfig | 1 + configs/xilinx_zynqmp_mini_nand_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 3 +- configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 3 +- configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 3 +- configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 5 +- configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 3 +- configs/xilinx_zynqmp_zcu102_revA_defconfig | 3 +- configs/xilinx_zynqmp_zcu102_revB_defconfig | 3 +- configs/zynq_cc108_defconfig | 2 +- configs/zynq_cse_qspi_defconfig | 2 +- configs/zynq_microzed_defconfig | 2 +- configs/zynq_picozed_defconfig | 2 +- configs/zynq_z_turn_defconfig | 2 +- configs/zynq_zc702_defconfig | 2 +- configs/zynq_zc706_defconfig | 4 +- configs/zynq_zc770_xm010_defconfig | 2 +- configs/zynq_zc770_xm011_defconfig | 2 +- configs/zynq_zc770_xm011_x16_defconfig | 5 +- configs/zynq_zc770_xm012_defconfig | 2 +- configs/zynq_zc770_xm013_defconfig | 2 +- configs/zynq_zed_defconfig | 6 +- configs/zynq_zybo_defconfig | 2 +- drivers/clk/clk_zynq.c | 2 +- drivers/clk/clk_zynqmp.c | 75 +++++++++++++++++++++++ drivers/fpga/fpga.c | 21 ++++--- drivers/mtd/nand/arasan_nfc.c | 7 ++- drivers/net/zynq_gem.c | 3 +- drivers/watchdog/Kconfig | 16 +++++ drivers/watchdog/Makefile | 1 + drivers/watchdog/cdns_wdt.c | 276 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/command.h | 2 + include/configs/xilinx_zynqmp.h | 4 +- include/configs/xilinx_zynqmp_ep.h | 24 -------- include/configs/xilinx_zynqmp_mini.h | 2 + tools/zynqimage.c | 6 ++ tools/zynqmpimage.c | 2 +- 64 files changed, 1030 insertions(+), 600 deletions(-) create mode 100644 arch/arm/dts/zynqmp-clk-ccf.dtsi delete mode 100644 arch/arm/dts/zynqmp-ep108-clk.dtsi delete mode 100644 arch/arm/dts/zynqmp-ep108.dts create mode 100644 board/xilinx/zynqmp/Kconfig create mode 100644 board/xilinx/zynqmp/cmds.c delete mode 100644 configs/xilinx_zynqmp_ep_defconfig create mode 100644 drivers/watchdog/cdns_wdt.c delete mode 100644 include/configs/xilinx_zynqmp_ep.h