Hi Tom,

please pull the following patches to your next branch. There are a lot of changes especially with Microblaze and having an option to disable MANUAL RELOC.

Gitlab CI doesn't show any issue.

And there is merge conflict with your next branch (Kconfig layout change) which is easy to resolve. Simply remove all reported lines from include/configs/microblaze-generic.h and include/configs/xilinx_zynqmp.h

Thanks, Michal

The following changes since commit c18e5fb055ab789f58434e3cb432582adee0134c:

dtoc: Update test_src_scan.py for new tegra compatibles (2022-06-14 13:59:23 -0400)

are available in the Git repository at:

git@source.denx.de:u-boot/custodians/u-boot-microblaze.git tags/xilinx-for-v2022.10

for you to fetch changes up to 728a86edb63a647e6faf211c0dbc7bd0e4ff7ac6:

timer: Add SPL_REGMAP dependency for Xilinx timer (2022-06-27 09:03:54 +0200)

---------------------------------------------------------------- Xilinx changes for v2022.10

cpu: - Add driver for microblaze cpu

net: - Add support for DM_ETH_PHY to AXI emac and emaclite

xilinx: - Switch platforms to DM_ETH_PHY - DT chagnes in ZynqMP and Zynq - Enable support for SquashFS

zynqmp: - Add support for KR260 boards - Move BSS from address 0 - Move platform identification from board code to soc driver - Improve zynqmp_psu_init_minimize

versal: - Enable loading app at EL1

serial: - Setup default address and clock rates for DEBUG uarts

pinctrl: - Add support for tri state and output enable properties

relocate-rela: - Clean relocate-rela implementation for ARM64 - Add support for Microblaze

microblaze: - Add support for runtime relocation - Rework cache handling (wiring, Kconfig) based on cpuinfo - Remove interrupt support

timer: - Extract axi timer driver from Microblaze to generic location

---------------------------------------------------------------- Amit Kumar Mahapatra (1): ARM: zynq: Fix size-cells for pl353 driver

Ashok Reddy Soma (3): arm64: versal: Add support to load an app at EL1 pinctrl: zynqmp: Add support for output-enable and bias-high-impedance arm64: zynqmp: Fix usb node drive strength and slew rate

Michal Simek (34): arm64: zynqmp: Add debug messages to bl2_plat_get_bl31_params() serial: Setup serial base and freq for zynq/zynqmp arm64: zynqmp: Add support for kr260 revA/B boards arm64: zynqmp: Enable DP for kv260-revA board arm64: zynqmp: Fix i2c addresses for vck190 SC arm64: zynqmp: Update tps53681 i2c address arm64: zynqmp: Fix tps544/u3007 node description tools: relocate-rela: Open binary u-boot file later Makefile: Fix description for relocate-rela parameters tools: relocate-rela: Use global variables tools: relocate-rela: Read rela start/end directly from ELF microblaze: Switch absolute branches to relative microblaze: Fix stack protection behavior microblaze: Fix early stack allocation microblaze: Remove CONFIG_TEXT_BASE from code microblaze: Fix typo in exception.c mips: Move endianness selection to arch/Kconfig microblaze: Enable REMAKE_ELF microblaze: Separate code end substraction microblaze: Change stack protection address to new stack address microblaze: Optimize register usage in relocate_code microblaze: Remove code around r20 in relocate_code() microblaze: Remove _start symbol handling at U-Boot start microblaze: Add comment about reset location microblaze: Create SYM_ADDR macro to deal with symbols tools: relocate-rela: Extract elf64 reloc to special function tools: relocate-rela: Check that relocation works only for EM_AARCH64 tools: relocate-rela: Add support for elf32 decoding tools: relocate-rela: Add support for 32bit Microblaze relocation microblaze: Add support for run time relocation microblaze: Convert axi timer to DM driver microblaze: Remove interrupt handler xilinx: Enable support for SquashFS timer: Add SPL_REGMAP dependency for Xilinx timer

Ovidiu Panait (14): cmd: cpu: migrate cpu command to U_BOOT_CMD_WITH_SUBCMDS() cpu-uclass: relocate ops pointers for CONFIG_NEEDS_MANUAL_RELOC microblaze: start.S: remove unused code microblaze: cache: replace XILINX_USE_DCACHE -> CONFIG_DCACHE microblaze: cache: improve dcache Kconfig options microblaze: cache: improve icache Kconfig options microblaze: cache: split flush_cache() function microblaze: cache: introduce Kconfig options for icache/dcache sizes microblaze: cache: introduce flush_cache_all() microblaze: cache: introduce cpuinfo structure microblaze: cache: introduce flush_dcache_range() microblaze: Kconfig: introduce XILINX_MICROBLAZE0_FPGA_FAMILY option microblaze: add support for handling PVR data cpu: add CPU driver for microblaze

Stefan Herbrechtsmeier (16): xilinx: zynqmp: Do not use 0 as spl bss start address firmware: zynqmp: Check if rx channel dev pointer is valid firmware: zynqmp: Probe driver before use xilinx: zynqmp: Replace strncat with strlcat xilinx: zynqmp: Add macro for device type mask xilinx: zynqmp: Reuse shift macros to define masks xilinx: zynqmp: Merge device lists soc: xilinx: zynqmp: Remove redundant checks for zynqmp_mmio_read soc: xilinx: zynqmp: Add machine identification support xilinx: cpuinfo: Print soc machine xilinx: common: Separate display cpu info function xilinx: zynqmp: make spi flash support optional tools: zynqmp_psu_init_minimize: Remove low level uart settings tools: zynqmp_psu_init_minimize: Use CR instead of LF tools: zynqmp_psu_init_minimize: Move helper functions below header includes arm64: zynqmp: Move helper functions below header includes

T Karthik Reddy (3): net: xilinx: axi_emac: Use shared MDIO bus support for axi emac driver net: xilinx: axi_emaclite: Use shared MDIO bus support for axi emaclite driver xilinx: Add CONFIG_DM_ETH_PHY config

MAINTAINERS | 1 + Makefile | 6 +- arch/Kconfig | 32 +- arch/arm/dts/Makefile | 2 + arch/arm/dts/zynq-7000.dtsi | 2 +- arch/arm/dts/zynqmp-e-a2197-00-revA.dts | 6 +- arch/arm/dts/zynqmp-g-a2197-00-revA.dts | 4 +- arch/arm/dts/zynqmp-m-a2197-01-revA.dts | 4 +- arch/arm/dts/zynqmp-m-a2197-02-revA.dts | 8 +- arch/arm/dts/zynqmp-m-a2197-03-revA.dts | 8 +- arch/arm/dts/zynqmp-sck-kr-g-revA.dts | 388 +++ arch/arm/dts/zynqmp-sck-kr-g-revB.dts | 388 +++ arch/arm/dts/zynqmp-sck-kv-g-revA.dts | 7 +- arch/arm/dts/zynqmp-sck-kv-g-revB.dts | 5 +- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 5 +- arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 5 +- arch/arm/dts/zynqmp-zcu100-revC.dts | 10 +- arch/arm/dts/zynqmp-zcu102-revA.dts | 5 +- arch/arm/dts/zynqmp-zcu104-revA.dts | 6 +- arch/arm/dts/zynqmp-zcu104-revC.dts | 6 +- arch/arm/dts/zynqmp-zcu106-revA.dts | 5 +- arch/arm/dts/zynqmp-zcu111-revA.dts | 5 +- arch/arm/mach-zynqmp/handoff.c | 4 + arch/m68k/Kconfig | 3 + arch/microblaze/Kconfig | 22 +- arch/microblaze/config.mk | 11 + arch/microblaze/cpu/Makefile | 4 +- arch/microblaze/cpu/cache.c | 86 +- arch/microblaze/cpu/cpuinfo.c | 131 + arch/microblaze/cpu/exception.c | 2 +- arch/microblaze/cpu/interrupts.c | 182 +- arch/microblaze/cpu/pvr.c | 41 + arch/microblaze/cpu/relocate.c | 111 + arch/microblaze/cpu/start.S | 174 +- arch/microblaze/cpu/timer.c | 123 - arch/microblaze/cpu/u-boot.lds | 14 + arch/microblaze/include/asm/cache.h | 5 + arch/microblaze/include/asm/cpuinfo.h | 114 + arch/microblaze/include/asm/global_data.h | 5 + arch/microblaze/include/asm/microblaze_intc.h | 37 - arch/microblaze/include/asm/microblaze_timer.h | 26 - arch/microblaze/include/asm/pvr.h | 75 + arch/microblaze/lib/bootm.c | 4 +- arch/mips/Kconfig | 18 - board/xilinx/common/Makefile | 3 + board/xilinx/common/board.c | 25 - board/xilinx/common/cpu-info.c | 35 + board/xilinx/microblaze-generic/Kconfig | 54 + board/xilinx/versal/board.c | 17 + board/xilinx/zynqmp/zynqmp-e-a2197-00-revA/psu_init_gpl.c | 3478 ++++++++++---------- board/xilinx/zynqmp/zynqmp-zcu208-revA/psu_init_gpl.c | 3231 +++++++++--------- board/xilinx/zynqmp/zynqmp-zcu216-revA/psu_init_gpl.c | 3231 +++++++++--------- board/xilinx/zynqmp/zynqmp.c | 289 +- cmd/cpu.c | 39 +- common/board_f.c | 2 + configs/microblaze-generic_defconfig | 2 + configs/xilinx_versal_virt_defconfig | 2 + configs/xilinx_zynq_virt_defconfig | 2 + configs/xilinx_zynqmp_virt_defconfig | 2 + drivers/core/device.c | 5 - drivers/cpu/Kconfig | 9 + drivers/cpu/Makefile | 1 + drivers/cpu/cpu-uclass.c | 30 + drivers/cpu/microblaze_cpu.c | 180 + drivers/firmware/firmware-zynqmp.c | 23 +- drivers/net/xilinx_axi_emac.c | 38 +- drivers/net/xilinx_emaclite.c | 43 +- drivers/pinctrl/pinctrl-zynqmp.c | 9 + drivers/serial/Kconfig | 4 + drivers/soc/soc_xilinx_zynqmp.c | 286 +- drivers/timer/Kconfig | 9 + drivers/timer/Makefile | 1 + drivers/timer/xilinx-timer.c | 82 + include/configs/microblaze-generic.h | 8 - include/configs/xilinx_zynqmp.h | 2 +- tools/relocate-rela.c | 545 ++- tools/zynqmp_psu_init_minimize.sh | 27 +- 77 files changed, 7897 insertions(+), 5917 deletions(-) create mode 100644 arch/arm/dts/zynqmp-sck-kr-g-revA.dts create mode 100644 arch/arm/dts/zynqmp-sck-kr-g-revB.dts create mode 100644 arch/microblaze/cpu/cpuinfo.c create mode 100644 arch/microblaze/cpu/pvr.c create mode 100644 arch/microblaze/cpu/relocate.c delete mode 100644 arch/microblaze/cpu/timer.c create mode 100644 arch/microblaze/include/asm/cpuinfo.h delete mode 100644 arch/microblaze/include/asm/microblaze_intc.h delete mode 100644 arch/microblaze/include/asm/microblaze_timer.h create mode 100644 arch/microblaze/include/asm/pvr.h create mode 100644 board/xilinx/common/cpu-info.c create mode 100644 drivers/cpu/microblaze_cpu.c create mode 100644 drivers/timer/xilinx-timer.c