Merge branch 'master' of /home/wd/git/u-boot/master

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

diff --git a/board/esd/cms700/cms700.c b/board/esd/cms700/cms700.c
index 391fbf4c1bd0f67602580428abc03b23daaa6b55..dcd49d4faaa30b5cfef727065998f88fadd48017 100644 (file)
--- a/board/esd/cms700/cms700.c
+++ b/board/esd/cms700/cms700.c
@@ -96,7 +96,7 @@ int checkboard (void)
 
        puts ("Board: ");
 
-       if (getenv_r("serial#", str, sizeof(str))  == -1) {
+       if (getenv_f("serial#", str, sizeof(str))  == -1) {
                puts ("### No HW ID - assuming CMS700");
        } else {
                puts(str);
@@ -157,7 +157,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;