Extend spl_boot_list[] only when SPL has support for it.

Signed-off-by: Michal Simek <[email protected]>
---

 arch/microblaze/cpu/spl.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/arch/microblaze/cpu/spl.c b/arch/microblaze/cpu/spl.c
index 521776705786..f9b0a0aca219 100644
--- a/arch/microblaze/cpu/spl.c
+++ b/arch/microblaze/cpu/spl.c
@@ -14,9 +14,16 @@
 
 void board_boot_order(u32 *spl_boot_list)
 {
-       spl_boot_list[0] = BOOT_DEVICE_NOR;
-       spl_boot_list[1] = BOOT_DEVICE_RAM;
-       spl_boot_list[2] = BOOT_DEVICE_SPI;
+       u32 i = 0;
+
+       if (CONFIG_IS_ENABLED(NOR_SUPPORT))
+               spl_boot_list[i++] = BOOT_DEVICE_NOR;
+
+       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;
 }
 
 /* Board initialization after bss clearance */
-- 
2.43.0

base-commit: 885493d6d299a4f0fab522f53af24b625d0ac526
branch: debian-sent3

Reply via email to