From: Tom Rini <trini@konsulko.com>
Date: Mon, 21 Feb 2022 13:32:02 +0000 (-0500)
Subject: Merge tag 'xilinx-for-v2022.04-rc3' of https://gitlab.denx.de/u-boot/custodians/u... 
X-Git-Tag: baikal/mips/sdk5.9~7^2^2~49
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=0c92565f007f04a200a9cd0b7f768bf41a4f9dde;p=uboot.git

Merge tag 'xilinx-for-v2022.04-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze

Xilinx changes for v2022.04-rc3

microblaze:
- Fix exception handler

zynqmp:
- Show information about secure images
- DT changes (som u-boot file removal)
- Fix zynqmp_pm_cfg_obj_convert.py
- Fix platform boot

xilinx:
- Fix bootm_size calculation
- Remove GPIO_EXTRA_HEADER selection

power:
- Add zynqmp power management driver

scsi:
- Add phy support to ceva driver

zynq qspi:
- Fix unaligned accesses and check baudrate setup
- Add support for spi memory operations

net:
- Fix 64bit calculation in axi_emac

video:
- Add missing gpio dependency for seps driver
---

0c92565f007f04a200a9cd0b7f768bf41a4f9dde
diff --cc configs/xilinx_zynqmp_virt_defconfig
index 6ea15751de,7b295282e3..976cb02c0f
--- a/configs/xilinx_zynqmp_virt_defconfig
+++ b/configs/xilinx_zynqmp_virt_defconfig
@@@ -18,10 -18,8 +18,9 @@@ CONFIG_ZYNQ_MAC_IN_EEPROM=
  CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x20
  CONFIG_CMD_FRU=y
  CONFIG_ZYNQMP_USB=y
- CONFIG_ZYNQMP_PSU_INIT_ENABLED=y
  CONFIG_AHCI=y
  CONFIG_DISTRO_DEFAULTS=y
 +CONFIG_REMAKE_ELF=y
  CONFIG_SYS_LOAD_ADDR=0x8000000
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y