diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-21 22:04:17 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-21 22:04:17 +0100 |
| commit | 74faaf96564e6d60fb436e0c1f9e502b778fe9ec (patch) | |
| tree | 268c3f4394dd33ff4ad4588451ed6524fd90cc81 | |
| parent | 3bf03add545f8988f2fef64b7975beb4ec8bf99f (diff) | |
| parent | e29ad970f10c68f93c900810ee184ccf0cee7d91 (diff) | |
| download | u-boot-imx-74faaf96564e6d60fb436e0c1f9e502b778fe9ec.zip u-boot-imx-74faaf96564e6d60fb436e0c1f9e502b778fe9ec.tar.gz u-boot-imx-74faaf96564e6d60fb436e0c1f9e502b778fe9ec.tar.bz2 | |
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
| -rw-r--r-- | arch/blackfin/config.mk | 3 | ||||
| -rw-r--r-- | arch/blackfin/cpu/traps.c | 15 | ||||
| -rw-r--r-- | arch/blackfin/lib/board.c | 1 |
3 files changed, 12 insertions, 7 deletions
diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk index f9d46de..3595aa2 100644 --- 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 0cb833a..20aeab8 100644 --- 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 a70473c..e3ee4cd 100644 --- 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 */ |