projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot
[platform/kernel/u-boot.git]
/
common
/
spl
/
spl.c
diff --git
a/common/spl/spl.c
b/common/spl/spl.c
index
1826c47
..
ded0f30
100644
(file)
--- a/
common/spl/spl.c
+++ b/
common/spl/spl.c
@@
-229,9
+229,14
@@
void board_init_r(gd_t *dummy1, ulong dummy2)
spl_sata_load_image();
break;
#endif
spl_sata_load_image();
break;
#endif
+#ifdef CONFIG_SPL_BOARD_LOAD_IMAGE
+ case BOOT_DEVICE_BOARD:
+ spl_board_load_image();
+ break;
+#endif
default:
#if defined(CONFIG_SPL_SERIAL_SUPPORT) && defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
default:
#if defined(CONFIG_SPL_SERIAL_SUPPORT) && defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
- p
rintf("SPL: Unsupported Boot Device %d\n", boot_device
);
+ p
uts("SPL: Unsupported Boot Device!\n"
);
#endif
hang();
}
#endif
hang();
}