diff options
| author | Tom Rini <trini@konsulko.com> | 2022-05-25 16:50:08 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-05-25 16:50:08 +0300 |
| commit | 661f5400754750df4104b6466942c8b62897340d (patch) | |
| tree | 5ccaa46280decbe9696b58344eaedf2b2893e3cc /include | |
| parent | 7e0edcadb09d55d5319fdc862041fd1b874476f5 (diff) | |
| parent | 594f692f491f0def6c4b6543e158a7f367b35dcc (diff) | |
| download | u-boot-661f5400754750df4104b6466942c8b62897340d.tar.xz | |
Merge tag 'xilinx-for-v2022.07-rc4' of https://source.denx.de/u-boot/custodians/u-boot-microblaze
Xilinx changes for v2022.07-rc4
zynqmp:
- Fix DP PLL configuration for zcu102/zcu106 and SOM
- Fix split mode for starting R5s
- DT fixes
- Remove firmware node for mini configurations
- Wire TEE for multi DTB fit image
xilinx:
- Handle board_get_usable_ram_top(0) properly
phy:
- Extend psgtr timeout
mmc:
- Fix mini configuration which misses zynqmp_pm_is_function_supported()
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/xilinx_zynqmp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 8eb44b18d2..f25d796a1e 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -226,7 +226,6 @@ #define CONFIG_SPL_FS_LOAD_KERNEL_NAME "atf-uboot.ub" /* MMC support */ -#ifdef CONFIG_MMC_SDHCI_ZYNQ # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0 /* unused */ # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0 /* unused */ # if defined(CONFIG_SPL_LOAD_FIT) @@ -234,7 +233,6 @@ # else # define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" # endif -#endif #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_DFU) # define CONFIG_SPL_HASH |