GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-07-23 15:27:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bootstage: Replace show_boot_progress/error() with bootstage_...()

Browse source 
These calls should not be made directly any more, since bootstage
will call the show_boot_...() functions as needed.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2012-02-13 13:51:18 +00:00 • committed by Wolfgang Denk
parent 5ff55390ed
commit 770605e4f9
22 changed files with 166 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

16
common/cmd_net.c
View file

@ -230,37 +230,37 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
break;
#endif
default:
show_boot_error(BOOTSTAGE_ID_NET_START);
bootstage_error(BOOTSTAGE_ID_NET_START);
return CMD_RET_USAGE;
}
show_boot_progress(BOOTSTAGE_ID_NET_START);
bootstage_mark(BOOTSTAGE_ID_NET_START);
if ((size = NetLoop(proto)) < 0) {
show_boot_error(BOOTSTAGE_ID_NET_NETLOOP_OK);
bootstage_error(BOOTSTAGE_ID_NET_NETLOOP_OK);
return 1;
}
show_boot_progress(BOOTSTAGE_ID_NET_NETLOOP_OK);
bootstage_mark(BOOTSTAGE_ID_NET_NETLOOP_OK);
/* NetLoop ok, update environment */
netboot_update_env();
/* done if no file was loaded (no errors though) */
if (size == 0) {
show_boot_error(BOOTSTAGE_ID_NET_LOADED);
bootstage_error(BOOTSTAGE_ID_NET_LOADED);
return 0;
}
/* flush cache */
flush_cache(load_addr, size);
show_boot_progress(BOOTSTAGE_ID_NET_LOADED);
bootstage_mark(BOOTSTAGE_ID_NET_LOADED);
rcode = bootm_maybe_autostart(cmdtp, argv[0]);
if (rcode < 0)
show_boot_error(BOOTSTAGE_ID_NET_DONE_ERR);
bootstage_error(BOOTSTAGE_ID_NET_DONE_ERR);
else
show_boot_progress(BOOTSTAGE_ID_NET_DONE);
bootstage_mark(BOOTSTAGE_ID_NET_DONE);
return rcode;
}