From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 12D0CC433FE for ; Fri, 14 Jan 2022 15:42:48 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C9BB583394; Fri, 14 Jan 2022 16:42:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1642174966; bh=/AIwK6Y0SdqQI6hQ3oKpv4OIKQdAIPwZw2dzup1hMSA=; h=Date:To:From:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=pkdAdPE9zsh2PNdv3phtqlr/fA9aiOjzcEwNElp6B9D2fPgJT7vRTgCOIjBldISVz KWNQG+JRXAuwPwZMir/UVX+JmwwoaaeRzKusjqMdLuc3qiiyY7K8Zm/UHkH9eniyoS wUKOxzosiUx6mISJs3BVwkCoGvjhwhEczlAwvJY0izhJwAneGlQQ2djTWDsYICz3wl dlVR2wj5If+1Gz38bM5loIpXFrrf/s6yjXN6Vq3lzUfZd5+ceBVAbo+XpcHsYwIzkK Ahn+haBjcfWexzE2xSEkH98RIsoiqxoXigYDkVTEkU5zveTYB549m3r+5QzznlaEX1 oOuQ97j7FraAg== Received: by phobos.denx.de (Postfix, from userid 109) id 14FEF833A2; Fri, 14 Jan 2022 16:42:43 +0100 (CET) Received: from mout-u-204.mailbox.org (mout-u-204.mailbox.org [91.198.250.253]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A2ACD83388 for ; Fri, 14 Jan 2022 16:42:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sr@denx.de Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:105:465:1:3:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-u-204.mailbox.org (Postfix) with ESMTPS id 4Jb5Cg3y83zQkH3; Fri, 14 Jan 2022 16:42:39 +0100 (CET) Message-ID: <78091a3e-d92c-30d5-7c19-7392cc125735@denx.de> Date: Fri, 14 Jan 2022 16:42:35 +0100 MIME-Version: 1.0 Content-Language: en-US To: Tom Rini , U-Boot Mailing List From: Stefan Roese Subject: Please pull u-boot-marvell/master Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Hi Tom, please pull the following Marvell MVEBU related patches: ---------------------------------------------------------------- - mvebu: Move PCIe code from serdes to PCIe driver (Pali) - mtd: nand: pxa3xx: use marvell, prefix for custom DT properties (Pierre) - Add PCIe support for Iomega iConnect board (Tony) - ddr: marvell: a38x: Misc improvements / fixes (Marek) - tools: kwbimage: Load address fixes (Pali) - mvebu: db-88f6720: Fix CONFIG_SPL_TEXT_BASE and remove wrong memory layout (Pali) - mvebu: Replace hardcoded values 0x0030/0x4030 by proper calculation (Pali) ---------------------------------------------------------------- Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=147&view=results Thanks, Stefan The following changes since commit 25711b07ca1dcf73dc41b45ca040dadbcff0fa08: Merge tag 'dm-pull-13jan22' of https://source.denx.de/u-boot/custodians/u-boot-dm (2022-01-13 14:33:02 -0500) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-marvell.git for you to fetch changes up to 1dcbcc715e87da6d30b8ae22f1ef04c881cfea5b: arm: mvebu: Replace hardcoded values 0x0030/0x4030 by proper calculation (2022-01-14 11:39:16 +0100) ---------------------------------------------------------------- Marek Behún (3): ddr: marvell: a38x: Fix Synchronous vs Asynchronous mode determination board: gdsys: Drop Dirk Eibach from MAINTAINERS ddr: marvell: a38x: fix SPLIT_OUT_MIX state decision Pali Rohár (31): arm: mvebu: Convert board_pex_config() to CONFIG_SPL_BOARD_INIT board: gdsys: a38x: Enable PCIe link 2 in spl_board_init() pci: pci_mvebu: Fix PCIe MEM and IO resources assignment and mbus mapping pci: pci_mvebu: Inline mvebu_pcie_port_parse_dt() function pci: pci_mvebu: Remove dependency on SOC_REGS_PHY_BASE macro pci: pci_mvebu: Split initialization of PCIe ports into 3 phases pci: pci_mvebu: Wait 100ms for Link Up in mvebu_pcie_probe() arm: mvebu: Implement simple mvebu-reset driver for enabling/disabling PCIe ports arm: mvebu: a38x: serdes: Move non-serdes PCIe code to pci_mvebu.c tools: kwbimage: Mark all local functions as static tools: kwbimage: Deduplicate v1 regtype header finishing tools: kwbimage: Fix generating image with multiple DATA_DELAY commands tools: kwbimage: Preserve order of BINARY, DATA and DATA_DELAY commands arm: mvebu: Generate kwbimage.cfg with $(call cmd, ...) tools: kwbimage: Add support for specifying CPU core tools: kwbimage: Add support for specifying LOAD_ADDRESS for BINARY command tools: kwbimage: Check the return value of image_headersz_v1() tools: kwbimage: Check for maximal kwbimage header size arm: mvebu: Set CPU for U-Boot SPL binary in kwbimage arm: mvebu: Correctly set LOAD_ADDRESS for U-Boot SPL binary in kwbimage tools: kwbimage: Enforce 128-bit boundary alignment only for Sheeva CPU arm: mvebu: Enable BootROM output on A38x tools: kwbimage: Add missing check for maximal value for DATA_DELAY tools: kwbimage: Show binary image offset in mkimage -l, in addition to size tools: kwbimage: Dump kwbimage config file on '-p -1' option tools: kwbimage: Do not cast const pointers to non-const pointers tools: kwbimage/kwboot: Check ext field for non-zero value tools: kwbimage: Extract main data image without -p arg for dumpimage tools: kwbimage: Fix mkimage/dumpimage -l argument arm: mvebu: db-88f6720: Fix CONFIG_SPL_TEXT_BASE and remove wrong memory layout arm: mvebu: Replace hardcoded values 0x0030/0x4030 by proper calculation Pierre Bourdon (1): mtd: nand: pxa3xx: use marvell, prefix for custom DT properties Tony Dinh (3): arm: kirkwood: iConnect : Add PCIe related configs arm: kirkwood: iConnect : Add PCIe late init arm: kirkwood: iConnect : Update board maintainer arch/arm/dts/armada-375.dtsi | 5 +- arch/arm/dts/armada-380.dtsi | 3 + arch/arm/dts/armada-385.dtsi | 4 + arch/arm/dts/armada-38x.dtsi | 1 + arch/arm/dts/armada-cp110.dtsi | 2 +- arch/arm/dts/armada-xp-98dx3236.dtsi | 2 + arch/arm/dts/armada-xp-mv78230.dtsi | 5 + arch/arm/dts/armada-xp-mv78260.dtsi | 9 + arch/arm/dts/armada-xp-mv78460.dtsi | 10 + arch/arm/dts/armada-xp-synology-ds414.dts | 1 + arch/arm/dts/armada-xp-theadorable.dts | 1 + arch/arm/dts/armada-xp.dtsi | 1 + arch/arm/mach-mvebu/Makefile | 26 +- arch/arm/mach-mvebu/include/mach/cpu.h | 5 +- arch/arm/mach-mvebu/kwbimage.cfg.in | 10 +- arch/arm/mach-mvebu/serdes/a38x/Makefile | 1 - arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c | 64 --- arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.h | 28 -- .../mach-mvebu/serdes/a38x/high_speed_env_spec.c | 19 - arch/arm/mach-mvebu/system-controller.c | 105 ++++ board/gdsys/a38x/MAINTAINERS | 1 - board/gdsys/a38x/controlcenterdc.c | 6 +- board/gdsys/mpc8308/MAINTAINERS | 2 +- board/iomega/iconnect/MAINTAINERS | 1 + board/iomega/iconnect/iconnect.c | 7 + configs/controlcenterdc_defconfig | 1 + configs/db-88f6720_defconfig | 2 +- configs/iconnect_defconfig | 5 + .../marvell/a38x/ddr3_training_centralization.c | 26 + drivers/ddr/marvell/a38x/mv_ddr_plat.c | 19 +- drivers/mtd/nand/raw/pxa3xx_nand.c | 4 +- drivers/pci/Kconfig | 1 + drivers/pci/pci_mvebu.c | 275 ++++++++--- include/configs/clearfog.h | 2 +- include/configs/db-88f6720.h | 15 +- include/configs/db-88f6820-amc.h | 2 +- include/configs/db-88f6820-gp.h | 2 +- include/configs/db-mv784mp-gp.h | 2 +- include/configs/ds414.h | 2 +- include/configs/helios4.h | 2 +- include/configs/maxbcm.h | 2 +- include/configs/theadorable.h | 2 +- include/configs/turris_omnia.h | 2 +- include/configs/x530.h | 2 +- tools/kwbimage.c | 549 +++++++++++++++++---- tools/kwbimage.h | 10 +- tools/kwboot.c | 4 +- 47 files changed, 920 insertions(+), 330 deletions(-) delete mode 100644 arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c delete mode 100644 arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.h create mode 100644 arch/arm/mach-mvebu/system-controller.c