mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-03-16 23:07:00 +00:00
spl: Move bloblist writing until the image is known
The bloblist should not be finalised until the image is fully set up. This allows any final handoff information to be included in the bloblist. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
2354daaf39
commit
a17e1e76c8
1 changed files with 12 additions and 12 deletions
|
@ -724,18 +724,6 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
|
|||
}
|
||||
|
||||
spl_perform_fixups(&spl_image);
|
||||
if (CONFIG_IS_ENABLED(HANDOFF)) {
|
||||
ret = write_spl_handoff();
|
||||
if (ret)
|
||||
printf(SPL_TPL_PROMPT
|
||||
"SPL hand-off write failed (err=%d)\n", ret);
|
||||
}
|
||||
if (CONFIG_IS_ENABLED(BLOBLIST)) {
|
||||
ret = bloblist_finish();
|
||||
if (ret)
|
||||
printf("Warning: Failed to finish bloblist (ret=%d)\n",
|
||||
ret);
|
||||
}
|
||||
|
||||
os = spl_image.os;
|
||||
if (os == IH_OS_U_BOOT) {
|
||||
|
@ -782,6 +770,18 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
|
|||
dev->name, rc);
|
||||
}
|
||||
}
|
||||
if (CONFIG_IS_ENABLED(HANDOFF)) {
|
||||
ret = write_spl_handoff();
|
||||
if (ret)
|
||||
printf(SPL_TPL_PROMPT
|
||||
"SPL hand-off write failed (err=%d)\n", ret);
|
||||
}
|
||||
if (CONFIG_IS_ENABLED(BLOBLIST)) {
|
||||
ret = bloblist_finish();
|
||||
if (ret)
|
||||
printf("Warning: Failed to finish bloblist (ret=%d)\n",
|
||||
ret);
|
||||
}
|
||||
|
||||
spl_board_prepare_for_boot();
|
||||
jump_to_image_no_args(&spl_image);
|
||||
|
|
Loading…
Add table
Reference in a new issue