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 8990fc60580b1dcb9437aa13a7ff53863dbadd54..624c7088ac511c89ced4f8d7edc55fb1110a1836 100644 (file)
--- a/board/mpl/common/common_util.c
+++ b/board/mpl/common/common_util.c
@@ -29,7 +29,6 @@
 #include <asm/processor.h>
 #include <asm/byteorder.h>
 #include <i2c.h>
-#include <devices.h>
 #include <pci.h>
 #include <malloc.h>
 #include <bzlib.h>
@@ -49,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 */
@@ -286,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;
@@ -428,38 +426,9 @@ void check_env(void)
        }
 }
 
-
-extern device_t *stdio_devices[];
-extern char *stdio_names[];
-
-void show_stdio_dev(void)
-{
-       /* Print information */
-       puts("In:    ");
-       if (stdio_devices[stdin] == NULL) {
-               puts("No input devices available!\n");
-       } else {
-               printf ("%s\n", stdio_devices[stdin]->name);
-       }
-
-       puts("Out:   ");
-       if (stdio_devices[stdout] == NULL) {
-               puts("No output devices available!\n");
-       } else {
-               printf ("%s\n", stdio_devices[stdout]->name);
-       }
-
-       puts("Err:   ");
-       if (stdio_devices[stderr] == NULL) {
-               puts("No error devices available!\n");
-       } else {
-               printf ("%s\n", stdio_devices[stderr]->name);
-       }
-}
-
 #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;
@@ -559,8 +528,7 @@ int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                return 0;
        }
 #endif
-       printf("Usage:\n%s\n", cmdtp->usage);
-       return 1;
+       return cmd_usage(cmdtp);
 }
 
 
@@ -591,7 +559,7 @@ void video_get_info_str (int line_number, char *info)
        int i,boot;
        unsigned long pvr;
        char buf[64];
-       char tmp[16];
+       char buf1[32], buf2[32], buf3[32], buf4[32];
        char cpustr[16];
        char *s, *e, bc;
        switch (line_number)
@@ -644,11 +612,12 @@ void video_get_info_str (int line_number, char *info)
                        }
                        buf[i++]=0;
                }
-               sprintf (info," %s %s %s MHz (%lu/%lu/%lu MHz)",
+               sprintf (info," %s %s %s MHz (%s/%s/%s MHz)",
                        buf, cpustr,
-                       strmhz (tmp, gd->cpu_clk), sys_info.freqPLB / 1000000,
-                       sys_info.freqPLB / sys_info.pllOpbDiv / 1000000,
-                       sys_info.freqPLB / sys_info.pllExtBusDiv / 1000000);
+                       strmhz (buf1, gd->cpu_clk),
+                       strmhz (buf2, sys_info.freqPLB),
+                       strmhz (buf3, sys_info.freqPLB / sys_info.pllOpbDiv),
+                       strmhz (buf4, sys_info.freqPLB / sys_info.pllExtBusDiv));
                return;
        case 3:
                /* Memory Info */