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

[karo-tx-uboot.git] / board / siemens / SCM / scm.c

diff --git a/board/siemens/SCM/scm.c b/board/siemens/SCM/scm.c
index e0611fe370d5817148d422be84b171a8ff35e5e1..461b56e3ff8b94eaadc8dd4dd733e4bb6fcc8661 100644 (file)
--- a/board/siemens/SCM/scm.c
+++ b/board/siemens/SCM/scm.c
@@ -24,6 +24,7 @@
 #include <common.h>
 #include <ioports.h>
 #include <mpc8260.h>
+#include <linux/compiler.h>
 
 #include "scm.h"
 
@@ -209,7 +210,7 @@ const iop_conf_t iop_conf_tab[4][32] = {
 int checkboard (void)
 {
        char str[64];
-       int i = getenv_r ("serial#", str, sizeof (str));
+       int i = getenv_f("serial#", str, sizeof (str));
 
        puts ("Board: ");
 
@@ -397,7 +398,7 @@ static void config_scoh_cs (void)
        volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
        volatile memctl8260_t *memctl = &immr->im_memctl;
        volatile can_reg_t *can = (volatile can_reg_t *) CONFIG_SYS_CAN0_BASE;
-       volatile uint tmp, i;
+       __maybe_unused volatile uint tmp, i;
 
        /* Initialize OR3 / BR3 for CAN Bus Controller 0 */
        memctl->memc_or3 = CONFIG_SYS_CAN0_OR3;