|
@@ -337,16 +337,17 @@ void board_init_f(ulong dummy)
|
|
|
board_init_r(NULL, 0);
|
|
|
}
|
|
|
|
|
|
-void spl_board_init(void)
|
|
|
+void board_boot_order(u32 *spl_boot_list)
|
|
|
{
|
|
|
- u32 boot_device = spl_boot_device();
|
|
|
-
|
|
|
- if (boot_device == BOOT_DEVICE_SPI)
|
|
|
- puts("Booting from SPI flash\n");
|
|
|
- else if (boot_device == BOOT_DEVICE_MMC1)
|
|
|
- puts("Booting from MMC\n");
|
|
|
- else
|
|
|
- puts("Unknown boot device\n");
|
|
|
+ spl_boot_list[0] = spl_boot_device();
|
|
|
+ switch (spl_boot_list[0]) {
|
|
|
+ case BOOT_DEVICE_SPI:
|
|
|
+ spl_boot_list[1] = BOOT_DEVICE_MMC1;
|
|
|
+ break;
|
|
|
+ case BOOT_DEVICE_MMC1:
|
|
|
+ spl_boot_list[1] = BOOT_DEVICE_SPI;
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_SPL_MMC_SUPPORT
|