diff options
| author | Tom Rini <[email protected]> | 2024-12-03 15:51:56 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-12-03 15:51:56 -0600 |
| commit | df863c4aa30ee4e624058f64132b7243c6370ef5 (patch) | |
| tree | 8fe7f779125a2145ff160e7bccb636dd3eb5d5e2 /common | |
| parent | c33be116dcc2fe78291b41c4680cf5f774c3a345 (diff) | |
| parent | 46097afc70352ce5dc0caa8f95b74cba1e00af9b (diff) | |
Merge tag 'xilinx-for-v2025.04-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze into next
AMD/Xilinx changes for v2025.04-rc1
binman:
- Separate binman description from main DT
zynqmp:
- Enable binman for ZynqMP platforms
- DT sync with Linux v6.12
- Update usb5744 hub for SOMs
common:
- Drop SPL_FIT_GENERATOR support
versal2
- Enable OPTEE layers
ospi:
- Refactor the flash reset functionality
pytest:
- Fix tcminit mode handling
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_r.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/common/board_r.c b/common/board_r.c index 62228a723e1..ff9bce88dc9 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -287,13 +287,10 @@ static int initr_announce(void) return 0; } -static int initr_binman(void) +static int __maybe_unused initr_binman(void) { int ret; - if (!CONFIG_IS_ENABLED(BINMAN_FDT)) - return 0; - ret = binman_init(); if (ret) printf("binman_init failed:%d\n", ret); @@ -635,7 +632,9 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_EFI_LOADER efi_memory_init, #endif +#ifdef CONFIG_BINMAN_FDT initr_binman, +#endif #ifdef CONFIG_FSP_VERSION2 arch_fsp_init_r, #endif |