]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
microblaze: Fix SPL device support
authorMichal Simek <michal.simek@amd.com>
Fri, 16 Jan 2026 09:58:29 +0000 (10:58 +0100)
committerMichal Simek <michal.simek@amd.com>
Mon, 19 Jan 2026 08:17:00 +0000 (09:17 +0100)
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
arch/microblaze/cpu/spl.c

index 521776705786aef848a3ee31e5f1f94cc2a0cb91..f9b0a0aca2191b81968d494ac88a7f35daa46e46 100644 (file)
 
 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 */