Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-12-01 17:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

spl: add support for alternative boot device

Browse source 
Introduce spl_boot_list array, which defines a list of boot devices
that SPL will try before hanging. By default this list will consist
of only spl_boot_device(), but board_boot_order() can be overridden
by board code to populate the array with custom values.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Tom Rini <trini@konsulko.com>
Cc: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Nikita Kiryanov 2015-11-08 17:11:51 +02:00 committed by Tom Rini
parent 5211b87e0c
commit f101e4bd37
1 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
common/spl/spl.c
View file

@ -178,6 +178,23 @@ int spl_init(void)
return 0; return 0;
} }
#ifndef BOOT_DEVICE_NONE
#define BOOT_DEVICE_NONE 0xdeadbeef
#endif
static u32 spl_boot_list[] = {
BOOT_DEVICE_NONE,
BOOT_DEVICE_NONE,
BOOT_DEVICE_NONE,
BOOT_DEVICE_NONE,
BOOT_DEVICE_NONE,
};
__weak void board_boot_order(u32 *spl_boot_list)
{
spl_boot_list[0] = spl_boot_device();
}
static int spl_load_image(u32 boot_device) static int spl_load_image(u32 boot_device)
{ {
switch (boot_device) { switch (boot_device) {
@ -247,7 +264,7 @@ static int spl_load_image(u32 boot_device)
void board_init_r(gd_t *dummy1, ulong dummy2) void board_init_r(gd_t *dummy1, ulong dummy2)
{ {
u32 boot_device; int i;
debug(">>spl:board_init_r()\n"); debug(">>spl:board_init_r()\n");
@ -272,10 +289,18 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
spl_board_init(); spl_board_init();
#endif #endif
boot_device = spl_boot_device(); board_boot_order(spl_boot_list);
debug("boot device - %d\n", boot_device); for (i = 0; i < ARRAY_SIZE(spl_boot_list) &&
if (spl_load_image(boot_device)) spl_boot_list[i] != BOOT_DEVICE_NONE; i++) {
if (!spl_load_image(spl_boot_list[i]))
break;
}
if (i == ARRAY_SIZE(spl_boot_list) ||
spl_boot_list[i] == BOOT_DEVICE_NONE) {
puts("SPL: failed to boot from all boot devices\n");
hang(); hang();
}
switch (spl_image.os) { switch (spl_image.os) {
case IH_OS_U_BOOT: case IH_OS_U_BOOT: