diff options
| author | Simon Glass <sjg@chromium.org> | 2012-02-13 13:51:18 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-03-18 21:41:39 +0100 |
| commit | 770605e4f9874230728f5a592820c619b1565ebc (patch) | |
| tree | 3b2f89a4e63727c1ad650e98107acb58c0fcfe2f /common/cmd_net.c | |
| parent | 5ff55390ed80da2570fbeab51bdd2d2a43d4901a (diff) | |
| download | talos-obmc-uboot-770605e4f9874230728f5a592820c619b1565ebc.tar.gz talos-obmc-uboot-770605e4f9874230728f5a592820c619b1565ebc.zip | |
bootstage: Replace show_boot_progress/error() with bootstage_...()
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>
Diffstat (limited to 'common/cmd_net.c')
| -rw-r--r-- | common/cmd_net.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/common/cmd_net.c b/common/cmd_net.c index 897b6f6317..6139188bd4 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -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; } |
