From: Michal Simek <michal.simek@amd.com>
Date: Fri, 16 Jan 2026 09:58:29 +0000 (+0100)
Subject: microblaze: Fix SPL device support
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a532b5a2219d9e275fd1b9de40391852b30784a;p=thirdparty%2Fu-boot.git

microblaze: Fix SPL device support

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

Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/d1c1d677b2eb4266290d31dbdf2e6e44c77a75ff.1768557507.git.michal.simek@amd.com
---

diff --git a/arch/microblaze/cpu/spl.c b/arch/microblaze/cpu/spl.c
index 52177670578..f9b0a0aca21 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 */