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

[u-boot] / arch / powerpc / lib / board.c

diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c
index 35992aed9078eeba075cde9a378d8af2664c20b5..d5b75e5fbd4b3fe2440e85889cb8cff02df93d13 100644 (file)
--- a/arch/powerpc/lib/board.c
+++ b/arch/powerpc/lib/board.c
@@ -629,9 +629,6 @@ void board_init_r(gd_t *id, ulong dest_addr)
        bd_t *bd;
        ulong malloc_start;
 
-#if defined(CONFIG_SYS_FLASH_CHECKSUM) || defined(CONFIG_CMD_NET)
-       char *s;
-#endif
 #ifndef CONFIG_SYS_NO_FLASH
        ulong flash_size;
 #endif
@@ -1024,7 +1021,7 @@ void board_init_r(gd_t *id, ulong dest_addr)
         */
        {
                ulong pram = 0;
-               uchar memsz[32];
+               char memsz[32];
 
 #ifdef CONFIG_PRAM
                pram = getenv_ulong("pram", 10, CONFIG_PRAM);
@@ -1035,9 +1032,8 @@ void board_init_r(gd_t *id, ulong dest_addr)
                pram += (LOGBUFF_LEN + LOGBUFF_OVERHEAD) / 1024;
 #endif
 #endif
-               sprintf((char *) memsz, "%ldk",
-                       (bd->bi_memsize / 1024) - pram);
-               setenv("mem", (char *) memsz);
+               sprintf(memsz, "%ldk", (bd->bi_memsize / 1024) - pram);
+               setenv("mem", memsz);
        }
 #endif
 
@@ -1068,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_progress(-30);
+       bootstage_error(BOOTSTAGE_ID_NEED_RESET);
        for (;;)
                ;
 }