From: Padmarao Begari <[email protected]> Add board_boot_order() function and remove spl_boot_device() function because it is called from weak board_boot_order().
Add support to U-Boot SPL for booting from RAM or SPI, as configured in defconfig. Signed-off-by: Padmarao Begari <[email protected]> Signed-off-by: Michal Simek <[email protected]> --- board/xilinx/mbv/board.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/board/xilinx/mbv/board.c b/board/xilinx/mbv/board.c index ed3fe16af7b9..2b0005955ca5 100644 --- a/board/xilinx/mbv/board.c +++ b/board/xilinx/mbv/board.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * (C) Copyright 2023, Advanced Micro Devices, Inc. + * (C) Copyright 2023-2025, Advanced Micro Devices, Inc. * * Michal Simek <[email protected]> */ @@ -8,9 +8,15 @@ #include <spl.h> #ifdef CONFIG_SPL -u32 spl_boot_device(void) +void board_boot_order(u32 *spl_boot_list) { - /* RISC-V QEMU only supports RAM as SPL boot device */ - return BOOT_DEVICE_RAM; + u32 i = 0; + + if (CONFIG_IS_ENABLED(SPI_FLASH_SUPPORT)) + spl_boot_list[i++] = BOOT_DEVICE_SPI; + + if (CONFIG_IS_ENABLED(RAM_SUPPORT)) + spl_boot_list[i++] = BOOT_DEVICE_RAM; + } #endif -- 2.43.0 base-commit: 6eaad47c30990ffd230d21c7158bc7234cda1752 branch: debian-sent3
