diff options
| author | Tom Rini <[email protected]> | 2026-03-27 12:11:33 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-03-27 12:11:33 -0600 |
| commit | 6334f2967873516a10f329e4022d02b713e5be31 (patch) | |
| tree | d914103df99e1a0cc40afaa184b4a44c0f1b2299 /include | |
| parent | 80a4c49a4ab2ad06fa84a8b7bdf6e33b3b5101bf (diff) | |
| parent | fcc50761f3d0518c4d1693f75d2e79ad7b108355 (diff) | |
Merge tag 'xilinx-for-v2026.07-rc1-v2' of https://source.denx.de/u-boot/custodians/u-boot-microblaze into next
AMD/Xilinx/FPGA changes for v2026.07-rc1 v2
Kconfig:
- Correct XILINX_TIMER entry
- Rework TARGET_MICROBLAZE_GENERIC
- Fix CPU_MICROBLAZE PVR logic
- Remove non existing SPL_BINMAN_FDT
i2c:
- Wire pca9848 support
spi/cadence-qspi:
- Disable DAC mode
- Do reset pulse
net/gem:
- Disable broadcast packets
- Clear TXSR transfer complete
- Add support for dma-coherent
versal2:
- Enable GIC600 support
- Fix UFS distro boot wiring
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/amd_versal2.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/amd_versal2.h b/include/configs/amd_versal2.h index 404af2cd4c6..38d0bfc315b 100644 --- a/include/configs/amd_versal2.h +++ b/include/configs/amd_versal2.h @@ -108,7 +108,8 @@ #define BOOT_TARGET_DEVICES_UFS(func) func(UFS, ufs, 0) #define BOOTENV_DEV_UFS(devtypeu, devtypel, instance) \ - "bootcmd_" #devtypel "=" #devtypel " init " #instance "; scsi scan;\0" + "bootcmd_" #devtypel "=devnum=" #instance "; " \ + #devtypel " init $devnum; run scsi_boot\0" #define BOOTENV_DEV_NAME_UFS(devtypeu, devtypel, instance) \ "ufs " |