diff options
| author | Tom Rini <[email protected]> | 2024-06-17 11:01:35 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-06-17 11:01:35 -0600 |
| commit | f1de28e67aa9b66bfca0fad3dc18446a6ec0b504 (patch) | |
| tree | 6c61cf1a6ad593dbae8b449e12cf6467c14e3e0f /common | |
| parent | e242cd95130b64cf91692da41363ac59b25fc08d (diff) | |
| parent | e4a11e984d11cf4bbe55385cbae03c08f27ecd02 (diff) | |
Merge tag 'xilinx-for-v2024.10-rc1' of https://source.denx.de/u-boot/custodians/u-boot-microblaze into next
AMD/Xilinx changes for v2024.10-rc1
common:
- spl: Introduce SoC specific init function
xilinx:
- Enable FF-A and NVMEM
- Rename spl_board_init() to spl_soc_init()
zynqmp:
- DT alignments
- Enable reset from SPL
- Enable USB3 for KD240
- Align multiboot register on Kria for proper reboot
- Allow multiboot environment write even in saved environment
- Move zynqmp commands from board/ to arch/
- Clean up xilinx_zynqmp.h
versal:
- Do not prioritize boot device if driver is not enabled
versal-net:
- Setup location for redundant variables in SPI
versal2:
- Add support for new SOC
mmc:
- Fix tap delay for SD on Versal NET
spi:
- Add SPI_NOR_OCTAL_READ flag for mx66uw2g345gx0 flash part
gpio:
- Cover MODEPIN firmware dependency
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/Kconfig | 7 | ||||
| -rw-r--r-- | common/spl/spl.c | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index e0889401ecc..af43b5f5d3c 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -272,6 +272,13 @@ config SPL_TEXT_BASE help The address in memory that SPL will be running from. +config SPL_SOC_INIT + bool "Call SoC-specific initialization in SPL" + help + If this option is enabled, U-Boot will call the function + spl_soc_init() from board_init_r(). This function should be + provided by the SoC vendor. + config SPL_BOARD_INIT bool "Call board-specific initialization in SPL" help diff --git a/common/spl/spl.c b/common/spl/spl.c index 9a879e9fb10..7794ddccade 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -710,6 +710,9 @@ void board_init_r(gd_t *dummy1, ulong dummy2) } } + if (CONFIG_IS_ENABLED(SOC_INIT)) + spl_soc_init(); + if (CONFIG_IS_ENABLED(BOARD_INIT)) spl_board_init(); |
