|
@@ -410,23 +410,6 @@ static int spl_common_init(bool setup_malloc)
|
|
|
return ret;
|
|
|
}
|
|
|
#endif
|
|
|
- if (CONFIG_IS_ENABLED(BLOBLIST)) {
|
|
|
- ret = bloblist_init();
|
|
|
- if (ret) {
|
|
|
- debug("%s: Failed to set up bloblist: ret=%d\n",
|
|
|
- __func__, ret);
|
|
|
- return ret;
|
|
|
- }
|
|
|
- }
|
|
|
- if (CONFIG_IS_ENABLED(HANDOFF)) {
|
|
|
- int ret;
|
|
|
-
|
|
|
- ret = setup_spl_handoff();
|
|
|
- if (ret) {
|
|
|
- puts(SPL_TPL_PROMPT "Cannot set up SPL handoff\n");
|
|
|
- hang();
|
|
|
- }
|
|
|
- }
|
|
|
if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) {
|
|
|
ret = fdtdec_setup();
|
|
|
if (ret) {
|
|
@@ -604,6 +587,24 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
|
|
|
*/
|
|
|
timer_init();
|
|
|
#endif
|
|
|
+ if (CONFIG_IS_ENABLED(BLOBLIST)) {
|
|
|
+ ret = bloblist_init();
|
|
|
+ if (ret) {
|
|
|
+ debug("%s: Failed to set up bloblist: ret=%d\n",
|
|
|
+ __func__, ret);
|
|
|
+ puts(SPL_TPL_PROMPT "Cannot set up bloblist\n");
|
|
|
+ hang();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (CONFIG_IS_ENABLED(HANDOFF)) {
|
|
|
+ int ret;
|
|
|
+
|
|
|
+ ret = setup_spl_handoff();
|
|
|
+ if (ret) {
|
|
|
+ puts(SPL_TPL_PROMPT "Cannot set up SPL handoff\n");
|
|
|
+ hang();
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
#if CONFIG_IS_ENABLED(BOARD_INIT)
|
|
|
spl_board_init();
|