Fix saveenv output (again)

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 8621c99d1eadb74bcb2b3cca1d8451c7d5061710..435d60ecb96739ca28c4aa853a9f2273049d496a 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -288,9 +288,9 @@ void env_relocate (ulong offset)
 
        if (idata->env_valid == 0) {
 #if defined(CONFIG_GTH)                /* Environment not changable */
-               printf ("Using default environment\n\n");
+               puts ("Using default environment\n\n");
 #else
-               printf ("*** Warning - bad CRC, using default environment\n\n");
+               puts ("*** Warning - bad CRC, using default environment\n\n");
 #endif
                /*
                 * TODO: We should check here that the
@@ -410,7 +410,7 @@ int do_printenv (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
                        putc  ('\n');
 
                        if (ctrlc()) {
-                               printf ("\n ** Abort\n");
+                               puts ("\n ** Abort\n");
                                return 1;
                        }
                }
@@ -888,21 +888,24 @@ int saveenv(void)
        if (flash_sect_protect (0, (ulong)flash_sect_addr, end_addr))
                return 1;
 
+       puts ("Erasing Flash...");
        if (flash_sect_erase ((ulong)flash_sect_addr, end_addr))
                return 1;
 
+       puts ("Writing to Flash... ");
        switch (rc = flash_write(env_buffer, (ulong)flash_sect_addr, len)) {
-       case 0: break;
-       case 1: printf ("Timeout writing to Flash\n");
+       case 0: puts ("done\n");
+               break;
+       case 1: puts ("Timeout writing to Flash\n");
                rcode = 1;
                break;
-       case 2: printf ("Flash not Erased\n");
+       case 2: puts ("Flash not Erased\n");
                rcode = 1;
                break;
-       case 4: printf ("Can't write to protected Flash sectors\n");
+       case 4: puts ("Can't write to protected Flash sectors\n");
                rcode = 1;
                break;
-       case 8: printf ("Outside available Flash\n");
+       case 8: puts ("Outside available Flash\n");
                return 1;
        default:
                printf ("%s[%d] FIXME: rc=%d\n",__FILE__,__LINE__,rc);
@@ -925,7 +928,7 @@ int do_saveenv  (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
 {
        int rcode = 0;
 
-       printf (NVRAM_SAVESTR);
+       puts (NVRAM_SAVESTR);
        if (!saveenv())
            rcode = 1;