From: Tom Rini <trini@konsulko.com>
Date: Wed, 10 Apr 2024 17:51:58 +0000 (-0600)
Subject: Merge tag 'xilinx-for-v2024.07-rc1' of https://source.denx.de/u-boot/custodians/u... 
X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=843143303cb64133427ab1b3166185e936233d50;p=u-boot.git

Merge tag 'xilinx-for-v2024.07-rc1' of https://source.denx.de/u-boot/custodians/u-boot-microblaze

Xilinx changes for v2024.07-rc1

xilinx:
- Do not call env_get_location when !ENV_IS_NOWHERE
- Add FDT_FIXUP_PARTITIONS support
- Fix legacy format MAC decoding

zynqmp:
- Enable semihosting SPL support
- DT updates
- Kconfig resort/cleanup
- Don't describe second image/capsule if !SPL
- Add support for dfu/capsule description via MTD
- Support JTAG as alternative boot mode
- Add support for TEG soc variant

zynqmp-kria:
- Wire usb4 boot device
- Update SDIO tristate pin configuration
- Disable SPI_FLASH_BAR to avoid issue with SPI after update

mbv:
- Enable SPL and binman
- Small platform changes

zynqmp-nand:
- Error out in case of unsupported SW ECC
- Clean error path

versal-net:
- Support multiple locations for variables
---

843143303cb64133427ab1b3166185e936233d50
diff --cc board/xilinx/mbv/Kconfig
index d2dec397ed,9d5ee65cea..a3a6f21257
--- a/board/xilinx/mbv/Kconfig
+++ b/board/xilinx/mbv/Kconfig
@@@ -9,9 -9,18 +9,15 @@@ config SYS_VENDO
  config SYS_CPU
  	default "generic"
  
 -config SYS_CONFIG_NAME
 -	default "xilinx_mbv"
 -
  config TEXT_BASE
- 	default 0x80000000 if !RISCV_SMODE
- 	default 0x80400000 if RISCV_SMODE && ARCH_RV32I
+ 	default 0x21200000
+ 
+ config SPL_TEXT_BASE
+ 	default 0x20000000
+ 
+ config SPL_OPENSBI_LOAD_ADDR
+ 	hex
+ 	default 0x20200000
  
  config BOARD_SPECIFIC_OPTIONS
  	def_bool y