From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Simek Date: Tue, 7 Apr 2020 14:31:33 +0200 Subject: [GIT PULL] Xilinx patches for v2020.07 Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Tom, please pull the following changes for v2020.07. Travis and gitlab look good. https://travis-ci.org/github/michalsimek/u-boot/builds/671573769 https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze/pipelines/2633 The major change is switch Zynq to single platform as I have done for ZynqMP and started with Versal. Also several boards have been retested to make sure that they are still working. As a good side effect a lot of defconfigs was removed which decrease time spent on builds. As you see above travis and gitlabs CIs are fine. I have also updated Azure to match this but have no idea how can initiate it that's why this is not checked. Thanks, Michal The following changes since commit 74bf17db394d49c7041ee01a277fcf8d99b9a514: Merge branch 'master' of git://git.denx.de/u-boot-sh (2020-04-04 19:20:45 -0400) are available in the Git repository at: git at gitlab.denx.de:u-boot/custodians/u-boot-microblaze.git tags/xilinx-for-v2020.07 for you to fetch changes up to 895a7866c20cf6c01779b5a60fbf2770b88930a4: serial: zynq: Change uart initialization logic (2020-04-06 12:52:45 +0200) ---------------------------------------------------------------- Xilinx changes for v2020.07 common: - Align ENV_FAT_INTERFACE - Fix MAC address source print log - Improve based autodetection code xilinx: - Enable netconsole Microblaze: - Setup default ENV_OFFSET/ENV_SECT_SIZE Zynq: - Multiple DT updates/fixes - Use DEVICE_TREE environment variable for DTB selection - Switch to single zynq configuration - Enable NOR flash via DM - Minor SPL print removal - Enable i2c mux driver ZynqMP: - Print multiboot register - Enable cache commands in mini mtest - Multiple DT updates/fixes - Fix firmware probing when driver is not enabled - Specify 3rd backup RAM boot mode in SPL - Add SPL support for zcu102 v1.1 and zcu111 revA - Redesign debug uart enabling and psu_init delay - Enable full u-boot run from EL3 - Enable u-boot.itb generation without ATF with U-Boot in EL3 Versal: - Enable distro default - Enable others SPI flashes - Enable systems without DDR Drivers: - Gem: - Flush memory after freeing - Handle mdio bus separately - Watchdog: - Get rid of unused global data pointer - Enable window watchdog timer - Serial: - Change reinitialization logic in zynq serial driver ---------------------------------------------------------------- Amit Kumar Mahapatra (1): arm64: zynqmp: Do not duplicate flash partition label property Ashok Reddy Soma (3): arm64: dts: zynqmp: Add clk cells for sdhci net: zynq_gem: Add cache flush to zynq_gem_free_pkt watchdog: versal: Add support for Xilinx window watchdog Manish Narani (1): arm64: zynqmp: Add 'no-1-8-v' property for ZynqMP Boards Michal Simek (40): arm64: zynqmp: Print multiboot register value in EL3 arm64: zynqmp: Enable cache command for mini mtest configuration arm64: zynqmp: Replace gpio-key,wakeup with wakeup source arm64: zynqmp: Update Copyright years to 2020 ARM: zynq: Fix spi name node arm64: zynqmp: Remove unused zynqmp-clk.dtsi arm64: zynqmp: Remove second copy of reset-controller arm64: zynqmp: Sync DP subsystem arm64: zynqmp: Fix addresses in partition definitions ARM: zynq: Fix addresses in partition definitions arm64: zynqmp: Fix GIC compatible property arm64: zynqmp: Move pinctrl node under firmware node ARM: zynq: Change zc770 xm011 Nand x16 configurations Makefile: Add environment variable DEVICE_TREE to header ARM: zynq: Switch to single zynq configurations ARM: zynq: Do not include full zynq-7000.dtsi to cse-nor configuration nand: raw: Do not free xnand structure nand: raw: zynq: Do not try to probe driver if nand flash is disabled ARM: zynq: Do not report NOR flash detection failure ARM: zynq: Enable DM for CFI NOR flash env: Make mmc as default option for CONFIG_ENV_FAT_INTERFACE arm64: zynqmp: Check firmware node when driver is enabled ARM: zynq: Do not print message about boot device net: zynq-gem: Setup and use mdio base separately watchdog: cadence: Remove DECLARE_GLOBAL_DATA_PTR from driver arm64: zynqmp: Add third backup bootmode arm64: zynqmp Add support for zcu102 rev1.1 ARM: zynq: Enable i2c mux support for all boards net: eth-uclass: Fix message if mac is coming from DT or ROM arm64: zynqmp Add support for zcu111 revA arm64: zynqmp: Enable netconsole for ZynqMP lib: Improve _parse_integer_fixup_radix base 16 detection arm64: zynqmp: Add support for debug uart also for U-Boot proper arm64: zynqmp: Move timeout for clock propagation below psu_init firmware: zynqmp: Enable IPI code calling also in EL3 arm64: zynqmp: Reorder parameters for zynqmp_mmio_write() arm64: zynqmp: Add support for u-boot.itb generation without ATF arm64: versal: Disable DDR cache mapping if DDR is not enabled arm64: xilinx: Never touch DDR if system has no DDR serial: zynq: Change uart initialization logic Nava kishore Manne (1): arm64: zynqmp: Sync zynqmp fpga manager with mainline Quanyang Wang (1): ARM: dts: zc702: Fix I2C bus warnings Sudeep Holla (1): ARM: dts: zynq: replace gpio-key,wakeup with wakeup-source property T Karthik Reddy (2): configs: versal: Add CONFIG_DISTRO_DEFAULTS to versal defconfig arm64: versal: Enable support for Gigadevice/ISSI flashes Varalaxmi Bingi (1): env: Kconfig: Adding default values for Microblaze .azure-pipelines.yml | 6 +- .gitlab-ci.yml | 6 +- .travis.yml | 6 +- MAINTAINERS | 1 + Makefile | 14 +- arch/arm/dts/Makefile | 1 + arch/arm/dts/avnet-ultra96-rev1.dts | 2 +- arch/arm/dts/zynq-cse-nor.dts | 27 ++-- arch/arm/dts/zynq-cse-qspi.dtsi | 10 +- arch/arm/dts/zynq-topic-miami.dts | 10 +- arch/arm/dts/zynq-zc702.dts | 12 +- arch/arm/dts/zynq-zc770-xm010.dts | 2 +- arch/arm/dts/zynq-zc770-xm011-x16.dts | 12 +- arch/arm/dts/zynq-zc770-xm011.dts | 2 +- arch/arm/dts/zynq-zc770-xm013.dts | 2 +- arch/arm/dts/zynq-zturn.dts | 2 +- arch/arm/dts/zynqmp-clk-ccf.dtsi | 12 +- arch/arm/dts/zynqmp-clk.dtsi | 244 ---------------------------------- arch/arm/dts/zynqmp-mini-qspi.dts | 2 +- arch/arm/dts/zynqmp-zc1232-revA.dts | 10 +- arch/arm/dts/zynqmp-zc1254-revA.dts | 10 +- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 34 ++--- arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 6 +- arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts | 12 +- arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts | 2 +- arch/arm/dts/zynqmp-zcu100-revC.dts | 2 +- arch/arm/dts/zynqmp-zcu102-rev1.0.dts | 6 +- arch/arm/dts/zynqmp-zcu102-rev1.1.dts | 15 +++ arch/arm/dts/zynqmp-zcu102-revA.dts | 36 +++--- arch/arm/dts/zynqmp-zcu102-revB.dts | 2 +- arch/arm/dts/zynqmp-zcu104-revA.dts | 10 +- arch/arm/dts/zynqmp-zcu104-revC.dts | 10 +- arch/arm/dts/zynqmp-zcu106-revA.dts | 14 +- arch/arm/dts/zynqmp-zcu111-revA.dts | 14 +- arch/arm/dts/zynqmp-zcu1275-revA.dts | 10 +- arch/arm/dts/zynqmp-zcu1275-revB.dts | 10 +- arch/arm/dts/zynqmp-zcu1285-revA.dts | 6 +- arch/arm/dts/zynqmp-zcu208-revA.dts | 8 +- arch/arm/dts/zynqmp-zcu216-revA.dts | 8 +- arch/arm/dts/zynqmp.dtsi | 172 +++++++++++------------- arch/arm/mach-versal/Kconfig | 6 + arch/arm/mach-versal/cpu.c | 9 ++ arch/arm/mach-zynq/spl.c | 10 +- arch/arm/mach-zynqmp/include/mach/hardware.h | 4 +- arch/arm/mach-zynqmp/mkimage_fit_atf.sh | 23 +++- arch/arm/mach-zynqmp/spl.c | 11 +- board/xilinx/common/board.c | 6 +- board/xilinx/zynqmp/zynqmp-zcu102-rev1.1/psu_init_gpl.c | 1042 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/xilinx/zynqmp/zynqmp-zcu111-revA/psu_init_gpl.c | 978 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/xilinx/zynqmp/zynqmp.c | 36 +++++- configs/xilinx_versal_virt_defconfig | 20 +-- configs/xilinx_zynq_virt_defconfig | 23 +++- configs/xilinx_zynqmp_mini_defconfig | 1 + configs/xilinx_zynqmp_virt_defconfig | 3 +- configs/zynq_cc108_defconfig | 61 --------- configs/zynq_cse_nor_defconfig | 3 + configs/zynq_dlc20_rev1_0_defconfig | 76 ----------- configs/zynq_microzed_defconfig | 66 ---------- configs/zynq_minized_defconfig | 67 ---------- configs/zynq_picozed_defconfig | 54 -------- configs/zynq_z_turn_defconfig | 67 ---------- configs/zynq_zc702_defconfig | 83 ------------ configs/zynq_zc706_defconfig | 87 ------------- configs/zynq_zc770_xm010_defconfig | 61 --------- configs/zynq_zc770_xm011_defconfig | 48 ------- configs/zynq_zc770_xm011_x16_defconfig | 48 ------- configs/zynq_zc770_xm012_defconfig | 50 ------- configs/zynq_zc770_xm013_defconfig | 53 -------- configs/zynq_zed_defconfig | 70 ---------- configs/zynq_zybo_defconfig | 69 ---------- configs/zynq_zybo_z7_defconfig | 66 ---------- doc/board/xilinx/zynq.rst | 3 +- drivers/firmware/firmware-zynqmp.c | 2 +- drivers/mtd/nand/raw/zynq_nand.c | 25 ++-- drivers/net/zynq_gem.c | 28 +++- drivers/serial/serial_zynq.c | 11 +- drivers/watchdog/Kconfig | 9 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/cdns_wdt.c | 2 - drivers/watchdog/xilinx_wwdt.c | 179 +++++++++++++++++++++++++ env/Kconfig | 5 +- include/configs/zynq-common.h | 3 +- lib/strto.c | 15 ++- net/eth-uclass.c | 12 +- 85 files changed, 2675 insertions(+), 1593 deletions(-) mode change 120000 => 100644 arch/arm/dts/zynq-zc770-xm011-x16.dts delete mode 100644 arch/arm/dts/zynqmp-clk.dtsi create mode 100644 arch/arm/dts/zynqmp-zcu102-rev1.1.dts create mode 100644 board/xilinx/zynqmp/zynqmp-zcu102-rev1.1/psu_init_gpl.c create mode 100644 board/xilinx/zynqmp/zynqmp-zcu111-revA/psu_init_gpl.c delete mode 100644 configs/zynq_cc108_defconfig delete mode 100644 configs/zynq_dlc20_rev1_0_defconfig delete mode 100644 configs/zynq_microzed_defconfig delete mode 100644 configs/zynq_minized_defconfig delete mode 100644 configs/zynq_picozed_defconfig delete mode 100644 configs/zynq_z_turn_defconfig delete mode 100644 configs/zynq_zc702_defconfig delete mode 100644 configs/zynq_zc706_defconfig delete mode 100644 configs/zynq_zc770_xm010_defconfig delete mode 100644 configs/zynq_zc770_xm011_defconfig delete mode 100644 configs/zynq_zc770_xm011_x16_defconfig delete mode 100644 configs/zynq_zc770_xm012_defconfig delete mode 100644 configs/zynq_zc770_xm013_defconfig delete mode 100644 configs/zynq_zed_defconfig delete mode 100644 configs/zynq_zybo_defconfig delete mode 100644 configs/zynq_zybo_z7_defconfig create mode 100644 drivers/watchdog/xilinx_wwdt.c -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: OpenPGP digital signature URL: