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

* 'master' of git://git.denx.de/u-boot-blackfin:
  Blackfin: cache result of cpp check
  Blackfin: traps: fix up printf warnings from debug
  Blackfin: drop now unused local variable

diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk
index f9d46de23167ee86b8b14e44732315067cf0356b..3595aa2a9922d72bc1ce04492134e8f8d23ac2f8 100644 (file)
--- a/arch/blackfin/config.mk
+++ b/arch/blackfin/config.mk
@@ -48,9 +48,10 @@ ALL-y += $(obj)u-boot.ldr
 endif
 ifeq ($(CONFIG_ENV_IS_EMBEDDED_IN_LDR),y)
 CREATE_LDR_ENV = $(obj)tools/envcrc --binary > $(obj)env-ldr.o
-HOSTCFLAGS_NOPED += \
+HOSTCFLAGS_NOPED_ADSP := \
        $(shell $(CPP) -dD - -mcpu=$(CONFIG_BFIN_CPU) </dev/null \
                | awk '$$2 ~ /ADSP/ { print "-D" $$2 }')
+HOSTCFLAGS_NOPED += $(HOSTCFLAGS_NOPED_ADSP)
 else
 CREATE_LDR_ENV =
 endif

diff --git a/arch/blackfin/cpu/traps.c b/arch/blackfin/cpu/traps.c
index 0cb833a0e43f0db3fb4daaf0b8e17a5662ac510d..20aeab81a20418cce2c00de9fdfb202b43e516b4 100644 (file)
--- a/arch/blackfin/cpu/traps.c
+++ b/arch/blackfin/cpu/traps.c
@@ -150,7 +150,10 @@ int trap_c(struct pt_regs *regs, uint32_t level)
                                (data ? 'D' : 'I'), (void *)new_cplb_addr);
                        bfin_panic(regs);
                } else
-                       debug("CPLB addr %p matches map 0x%p - 0x%p\n", new_cplb_addr, bfin_memory_map[i].start, bfin_memory_map[i].end);
+                       debug("CPLB addr %p matches map 0x%p - 0x%p\n",
+                               (void *)new_cplb_addr,
+                               (void *)bfin_memory_map[i].start,
+                               (void *)bfin_memory_map[i].end);
                new_cplb_data = (data ? bfin_memory_map[i].data_flags : bfin_memory_map[i].inst_flags);
 
                if (data) {
@@ -163,16 +166,17 @@ int trap_c(struct pt_regs *regs, uint32_t level)
 
                /* find the next unlocked entry and evict it */
                i = last_evicted & 0xF;
-               debug("last evicted = %i\n", i);
+               debug("last evicted = %zu\n", i);
                CPLB_DATA = CPLB_DATA_BASE + i;
                while (*CPLB_DATA & CPLB_LOCK) {
-                       debug("skipping %i %p - %08X\n", i, CPLB_DATA, *CPLB_DATA);
+                       debug("skipping %zu %p - %08X\n", i, CPLB_DATA, *CPLB_DATA);
                        i = (i + 1) & 0xF;      /* wrap around */
                        CPLB_DATA = CPLB_DATA_BASE + i;
                }
                CPLB_ADDR = CPLB_ADDR_BASE + i;
 
-               debug("evicting entry %i: 0x%p 0x%08X\n", i, *CPLB_ADDR, *CPLB_DATA);
+               debug("evicting entry %zu: 0x%p 0x%08X\n", i,
+                       (void *)*CPLB_ADDR, *CPLB_DATA);
                last_evicted = i + 1;
 
                /* need to turn off cplbs whenever we muck with the cplb table */
@@ -190,7 +194,8 @@ int trap_c(struct pt_regs *regs, uint32_t level)
                CPLB_ADDR = CPLB_ADDR_BASE;
                CPLB_DATA = CPLB_DATA_BASE;
                for (i = 0; i < 16; ++i)
-                       debug("%2i 0x%p 0x%08X\n", i, *CPLB_ADDR++, *CPLB_DATA++);
+                       debug("%2zu 0x%p 0x%08X\n", i,
+                               (void *)*CPLB_ADDR++, *CPLB_DATA++);
 
                break;
        }

diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c
index a70473c229a9acf918a13f75115f39fc618dbf35..e3ee4cd353e364e0c8acbdda7889fb081c69c438 100644 (file)
--- a/arch/blackfin/lib/board.c
+++ b/arch/blackfin/lib/board.c
@@ -308,7 +308,6 @@ static void board_net_init_r(bd_t *bd)
 
 void board_init_r(gd_t * id, ulong dest_addr)
 {
-       char *s;
        bd_t *bd;
        gd = id;
        gd->flags |= GD_FLG_RELOC;      /* tell others: relocation done */