do_reset: unify duplicate prototypes

[karo-tx-uboot.git] / board / esd / hh405 / hh405.c

diff --git a/board/esd/hh405/hh405.c b/board/esd/hh405/hh405.c
index 4251d51b2eeab2c018598e1bfe682db86f2fa957..e9d2d36c1b2b861899a242bb9e5e414e894c6e31 100644 (file)
--- a/board/esd/hh405/hh405.c
+++ b/board/esd/hh405/hh405.c
@@ -236,7 +236,6 @@ static const SMI_REGS init_regs_1024x768 [] =
 #define FPGA_DEBUG
 #endif
 
-extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 extern void lxt971_no_sleep(void);
 
 /* fpga configuration data - gzip compressed and generated by bin2c */
@@ -650,7 +649,7 @@ int misc_init_r (void)
 int checkboard (void)
 {
        char str[64];
-       int i = getenv_r ("serial#", str, sizeof(str));
+       int i = getenv_f("serial#", str, sizeof(str));
 
        puts ("Board: ");
 
@@ -660,7 +659,7 @@ int checkboard (void)
                puts(str);
        }
 
-       if (getenv_r("bd_type", str, sizeof(str)) != -1) {
+       if (getenv_f("bd_type", str, sizeof(str)) != -1) {
                printf(" (%s", str);
        } else {
                puts(" (Missing bd_type!");
@@ -733,7 +732,7 @@ int eeprom_write_enable (unsigned dev_addr, int state)
        return state;
 }
 
-int do_eep_wren (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_eep_wren (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int query = argc == 1;
        int state = 0;
@@ -780,7 +779,7 @@ void video_get_info_str (int line_number, char *info)
 {
        char str[64];
        char str2[64];
-       int i = getenv_r("serial#", str2, sizeof(str));
+       int i = getenv_f("serial#", str2, sizeof(str));
 
        if (line_number == 1) {
                sprintf(str, " Board: ");
@@ -791,7 +790,7 @@ void video_get_info_str (int line_number, char *info)
                        strcat(str, str2);
                }
 
-               if (getenv_r("bd_type", str2, sizeof(str2)) != -1) {
+               if (getenv_f("bd_type", str2, sizeof(str2)) != -1) {
                        strcat(str, " (");
                        strcat(str, str2);
                } else {