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

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

diff --git a/board/esd/apc405/apc405.c b/board/esd/apc405/apc405.c
index 72c0907e015643177163e3f7891405719236d6df..564ee00445c777f244504c52bb170afa8bb03a31 100644 (file)
--- a/board/esd/apc405/apc405.c
+++ b/board/esd/apc405/apc405.c
@@ -37,7 +37,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #undef FPGA_DEBUG
 
-extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 extern void lxt971_no_sleep(void);
 extern ulong flash_get_size (ulong base, int banknum);
 
@@ -404,7 +404,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: ");