Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

[u-boot] / board / tqc / tqm8272 / tqm8272.c

diff --git a/board/tqc/tqm8272/tqm8272.c b/board/tqc/tqm8272/tqm8272.c
index 5bc080ff81e422006247fe34d3ab2682365e6d5f..9efb54125ec126f1d3fbc90d76a8f3bcb042858d 100644 (file)
--- a/board/tqc/tqm8272/tqm8272.c
+++ b/board/tqc/tqm8272/tqm8272.c
@@ -514,12 +514,16 @@ static inline int scanChar (char *p, int len, unsigned long *number)
 static int dump_hwib(void)
 {
        HWIB_INFO       *hw = &hwinf;
+       char buf[64];
+       int i = getenv_f("serial#", buf, sizeof(buf));
        volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
-       char *s = getenv("serial#");
+
+       if (i < 0)
+               buf[0] = '\0';
 
        if (hw->OK) {
                printf ("HWIB on %x\n", HWIB_INFO_START_ADDR);
-               printf ("serial : %s\n", s);
+               printf ("serial : %s\n", buf);
                printf ("ethaddr: %s\n", hw->ethaddr);
                printf ("FLASH  : %x nr:%d\n", hw->flash, hw->flash_nr);
                printf ("RAM    : %x cs:%d\n", hw->ram, hw->ram_cs);
@@ -858,7 +862,7 @@ int board_early_init_r(void)
 }
 #endif
 
-int do_hwib_dump (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int do_hwib_dump (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        dump_hwib ();
        return 0;
@@ -867,7 +871,7 @@ int do_hwib_dump (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
          hwib, 1,      1,      do_hwib_dump,
          "dump HWIB'",
-         "\n"
+         ""
 );
 
 #ifdef CONFIG_SYS_UPDATE_FLASH_SIZE