summaryrefslogtreecommitdiff
path: root/arch/powerpc/lib
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-02-13 13:51:18 +0000
committerWolfgang Denk <wd@denx.de>2012-03-18 21:41:39 +0100
commit770605e4f9874230728f5a592820c619b1565ebc (patch)
tree3b2f89a4e63727c1ad650e98107acb58c0fcfe2f /arch/powerpc/lib
parent5ff55390ed80da2570fbeab51bdd2d2a43d4901a (diff)
downloadu-boot-imx-770605e4f9874230728f5a592820c619b1565ebc.zip
u-boot-imx-770605e4f9874230728f5a592820c619b1565ebc.tar.gz
u-boot-imx-770605e4f9874230728f5a592820c619b1565ebc.tar.bz2
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 'arch/powerpc/lib')
-rw-r--r--arch/powerpc/lib/board.c2
-rw-r--r--arch/powerpc/lib/bootm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c
index dca3fd7..d5b75e5 100644
--- a/arch/powerpc/lib/board.c
+++ b/arch/powerpc/lib/board.c
@@ -1064,7 +1064,7 @@ void board_init_r(gd_t *id, ulong dest_addr)
void hang(void)
{
puts("### ERROR ### Please RESET the board ###\n");
- show_boot_error(BOOTSTAGE_ID_NEED_RESET);
+ bootstage_error(BOOTSTAGE_ID_NEED_RESET);
for (;;)
;
}
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index 37f162a..53dc4df 100644
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -69,7 +69,7 @@ static void boot_jump_linux(bootm_headers_t *images)
debug ("## Transferring control to Linux (at address %08lx) ...\n",
(ulong)kernel);
- show_boot_progress(BOOTSTAGE_ID_RUN_OS);
+ bootstage_mark(BOOTSTAGE_ID_RUN_OS);
#if defined(CONFIG_SYS_INIT_RAM_LOCK) && !defined(CONFIG_E500)
unlock_ram_in_cache();