From: Tom Rini <trini@konsulko.com>
Date: Thu, 25 Jun 2020 13:33:39 +0000 (-0400)
Subject: Merge tag 'xilinx-for-v2020.10' of https://gitlab.denx.de/u-boot/custodians/u-boot... 
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f0e236c8d6646f6ef0ebf8f043962a07dda3b3a3;p=oweals%2Fu-boot.git

Merge tag 'xilinx-for-v2020.10' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze into next

Xilinx changes for v2020.10

Versal:
- xspi bootmode fix
- Removing one clock from clk driver
- Align u-boot memory setting with OS by default
- Map TCM and OCM by default

ZynqMP:
- Minor DT improvements
- Reduce console buffer for mini configurations
- Add fix for AMS
- Add support for XDP platform

Zynq:
- Support for AES engine
- Enable bigger memory test by default
- Extend documentation for SD preparation
- Use different freq for Topic miami board

mmc:
- minor GD pointer removal

net:
- Support fixed-link cases by zynq gem
- Fix phy looking loop in axi enet driver

spi:
- Cleanup global macros for xilinx spi drivers

firmware:
- Add support for pmufw reloading

fpga:
- Improve error status reporting

common:
- Remove 4kB addition space for FDT allocation
---

f0e236c8d6646f6ef0ebf8f043962a07dda3b3a3
diff --cc configs/mx6cuboxi_defconfig
index e96afd028d,bfb4b86521..3eed9db6fa
--- a/configs/mx6cuboxi_defconfig
+++ b/configs/mx6cuboxi_defconfig
@@@ -22,9 -22,10 +22,10 @@@ CONFIG_FIT=
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
  CONFIG_USE_PREBOOT=y
 -CONFIG_PREBOOT="if hdmidet; then usb start; setenv stdin  serial,usbkbd; setenv stdout serial,vga; setenv stderr serial,vga; else setenv stdin  serial; setenv stdout serial; setenv stderr serial; fi;"
 +CONFIG_PREBOOT="if hdmidet; then usb start; setenv stdin  serial,usbkbd; setenv stdout serial,vidconsole; setenv stderr serial,vidconsole; else setenv stdin  serial; setenv stdout serial; setenv stderr serial; fi;"
  CONFIG_BOUNCE_BUFFER=y
  CONFIG_BOARD_EARLY_INIT_F=y
+ CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_SPL_FS_EXT4=y
  CONFIG_SPL_I2C_SUPPORT=y
  CONFIG_SPL_WATCHDOG_SUPPORT=y