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

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

diff --git a/board/esd/otc570/otc570.c b/board/esd/otc570/otc570.c
index 07d9c62977354d1f1050bc8b5c533b29f5987f9f..410d8b48a14f841d4d2b665bb851854eb11d49e2 100644 (file)
--- a/board/esd/otc570/otc570.c
+++ b/board/esd/otc570/otc570.c
@@ -258,7 +258,7 @@ int checkboard(void)
        char str[32];
 
        puts("Board: esd ARM9 HMI Panel - OTC570");
-       if (getenv_r("serial#", str, sizeof(str)) > 0) {
+       if (getenv_f("serial#", str, sizeof(str)) > 0) {
                puts(", serial# ");
                puts(str);
        }
@@ -308,7 +308,7 @@ int misc_init_r(void)
 
        printf("USART0: ");
 
-       if (getenv_r("usart0", str, sizeof(str)) == -1) {
+       if (getenv_f("usart0", str, sizeof(str)) == -1) {
                printf("No entry - assuming 1-wire\n");
                /* CTS pin, works as mode select pin (0 = 1-wire; 1 = RS485) */
                at91_set_pio_output(AT91_PIO_PORTA, 29, 0);