Rename getenv_r() into getenv_f()

[oweals/u-boot.git] / board / mpl / common / common_util.c

diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c
index 61af4aea1ac01ae8826dd63732518603b3b99514..624c7088ac511c89ced4f8d7edc55fb1110a1836 100644 (file)
--- a/board/mpl/common/common_util.c
+++ b/board/mpl/common/common_util.c
@@ -48,7 +48,6 @@ DECLARE_GLOBAL_DATA_PTR;
 #define FIRM_START 0xFFF00000
 #endif
 
-extern int gunzip(void *, int, uchar *, unsigned long *);
 extern int mem_test(ulong start, ulong ramsize, int quiet);
 
 #define I2C_BACKUP_ADDR 0x7C00         /* 0x200 bytes for backup */
@@ -285,13 +284,13 @@ void set_backup_values(int overwrite)
                }
        }
        memcpy(back.signature,"MPL\0",4);
-       i = getenv_r("serial#",back.serial_name,16);
+       i = getenv_f("serial#",back.serial_name,16);
        if(i < 0) {
                puts("Not possible to write Backup\n");
                return;
        }
        back.serial_name[16]=0;
-       i = getenv_r("ethaddr",back.eth_addr,20);
+       i = getenv_f("ethaddr",back.eth_addr,20);
        if(i < 0) {
                puts("Not possible to write Backup\n");
                return;
@@ -429,7 +428,7 @@ void check_env(void)
 
 #endif /* #if !defined(CONFIG_PATI) */
 
-int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        ulong size,src,ld_addr;
        int result;
@@ -529,8 +528,7 @@ int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                return 0;
        }
 #endif
-       cmd_usage(cmdtp);
-       return 1;
+       return cmd_usage(cmdtp);
 }