Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-20 20:04:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Blackfin: fixup misc warnings such as printf's and missing casts

Browse source 
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2008-10-12 06:02:55 -04:00
parent 1f4a3bb503
commit fe033ad6d0
7 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
board/bf533-ezkit/flash.c
View file

@ -127,7 +127,7 @@ void flash_print_info(flash_info_t * info)
printf("ST Microelectronics "); printf("ST Microelectronics ");
break; break;
default: default:
printf("Unknown Vendor: (0x%08X) ", info->flash_id); printf("Unknown Vendor: (0x%08lX) ", info->flash_id);
break; break;
} }
for (i = 0; i < info->sector_count; ++i) { for (i = 0; i < info->sector_count; ++i) {
@ -215,7 +215,7 @@ int write_data(long lStart, long lCount, uchar * pnData)
read_flash(ulOffset, &d); read_flash(ulOffset, &d);
if (d != 0xffff) { if (d != 0xffff) {
printf printf
("Flash not erased at offset 0x%x Please erase to reprogram \n", ("Flash not erased at offset 0x%lx Please erase to reprogram\n",
ulOffset); ulOffset);
return FLASH_FAIL; return FLASH_FAIL;
} }
@ -234,7 +234,7 @@ int write_data(long lStart, long lCount, uchar * pnData)
read_flash(ulOffset, &d); read_flash(ulOffset, &d);
if (d != 0xffff) { if (d != 0xffff) {
printf printf
("Flash not erased at offset 0x%x Please erase to reprogram \n", ("Flash not erased at offset 0x%lx Please erase to reprogram\n",
ulOffset); ulOffset);
return FLASH_FAIL; return FLASH_FAIL;
} }

4
board/bf537-stamp/spi_flash.c
View file

@ -797,8 +797,8 @@ int eeprom_info(void)
ret = 1; ret = 1;
else else
printf("SPI Device: %s 0x%02X (%s) 0x%02X 0x%02X\n" printf("SPI Device: %s 0x%02X (%s) 0x%02X 0x%02X\n"
"Parameters: num sectors = %i, sector size = %i, write size = %i\n" "Parameters: num sectors = %lu, sector size = %lu, write size = %i\n"
"Flash Size: %i mbit (%i mbyte)\n" "Flash Size: %lu mbit (%lu mbyte)\n"
"Status: 0x%02X\n", "Status: 0x%02X\n",
flash.flash->name, flash.manufacturer_id, flash.manufacturer->name, flash.flash->name, flash.manufacturer_id, flash.manufacturer->name,
flash.device_id1, flash.device_id2, flash.num_sectors, flash.device_id1, flash.device_id2, flash.num_sectors,

4
common/cmd_bootldr.c
View file

@ -64,8 +64,6 @@ static void ldr_load(uint8_t *base_addr)
/*defined(__ADSPBF534__) || defined(__ADSPBF536__) || defined(__ADSPBF537__) ||*/\ /*defined(__ADSPBF534__) || defined(__ADSPBF536__) || defined(__ADSPBF537__) ||*/\
defined(__ADSPBF538__) || defined(__ADSPBF539__) || defined(__ADSPBF561__) defined(__ADSPBF538__) || defined(__ADSPBF539__) || defined(__ADSPBF561__)
void *ret;
uint32_t addr; uint32_t addr;
uint32_t count; uint32_t count;
uint16_t flags; uint16_t flags;
@ -126,7 +124,7 @@ static void ldr_exec(void *addr)
#elif defined(__ADSPBF531__) || defined(__ADSPBF532__) || defined(__ADSPBF533__) || \ #elif defined(__ADSPBF531__) || defined(__ADSPBF532__) || defined(__ADSPBF533__) || \
defined(__ADSPBF538__) || defined(__ADSPBF539__) || defined(__ADSPBF561__) defined(__ADSPBF538__) || defined(__ADSPBF539__) || defined(__ADSPBF561__)
void (*ldr_entry)(void) = bfin_read_EVT1(); void (*ldr_entry)(void) = (void *)bfin_read_EVT1();
ldr_entry(); ldr_entry();
#else #else

4
common/cmd_cplbinfo.c
View file

@ -26,11 +26,11 @@ static const char *cplb_page_size(uint32_t data)
*/ */
static void show_cplb_table(uint32_t *addr, uint32_t *data) static void show_cplb_table(uint32_t *addr, uint32_t *data)
{ {
size_t i; int i;
printf(" Address Data Size Valid Locked\n"); printf(" Address Data Size Valid Locked\n");
for (i = 1; i <= 16; ++i) { for (i = 1; i <= 16; ++i) {
printf(" %2i 0x%p 0x%05X %s %c %c\n", printf(" %2i 0x%p 0x%05X %s %c %c\n",
i, *addr, *data, i, (void *)*addr, *data,
cplb_page_size(*data), cplb_page_size(*data),
(*data & CPLB_VALID ? 'Y' : 'N'), (*data & CPLB_VALID ? 'Y' : 'N'),
(*data & CPLB_LOCK ? 'Y' : 'N')); (*data & CPLB_LOCK ? 'Y' : 'N'));

6
common/cmd_otp.c
View file

@ -149,8 +149,8 @@ int do_otp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
"Writing one time programmable memory\n" "Writing one time programmable memory\n"
"Make sure your operating voltages and temperature are within spec\n" "Make sure your operating voltages and temperature are within spec\n"
" source address: 0x%p\n" " source address: 0x%p\n"
" OTP destination: %s page 0x%03X - %s page 0x%03X\n" " OTP destination: %s page 0x%03X - %s page 0x%03lX\n"
" number to write: %ld halfpages\n" " number to write: %lu halfpages\n"
" type \"YES\" (no quotes) to confirm: ", " type \"YES\" (no quotes) to confirm: ",
addr, addr,
lowup(half), page, lowup(half), page,
@ -175,7 +175,7 @@ int do_otp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
} }
} }
printf("OTP memory %s: addr 0x%08lx page 0x%03X count %ld ... ", printf("OTP memory %s: addr 0x%p page 0x%03X count %zu ... ",
argv[1], addr, page, count); argv[1], addr, page, count);
set_otp_timing(otp_func == bfrom_OtpWrite); set_otp_timing(otp_func == bfrom_OtpWrite);

21
cpu/blackfin/traps.c
View file

@ -111,7 +111,7 @@ void trap_c(struct pt_regs *regs)
} }
if (i == ARRAY_SIZE(bfin_memory_map)) { if (i == ARRAY_SIZE(bfin_memory_map)) {
printf("%cCPLB exception outside of memory map at 0x%p\n", printf("%cCPLB exception outside of memory map at 0x%p\n",
(data ? 'D' : 'I'), new_cplb_addr); (data ? 'D' : 'I'), (void *)new_cplb_addr);
bfin_panic(regs); bfin_panic(regs);
} else } 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", new_cplb_addr, bfin_memory_map[i].start, bfin_memory_map[i].end);
@ -207,20 +207,21 @@ static const char *symbol_lookup(unsigned long addr, unsigned long *caddr)
static void decode_address(char *buf, unsigned long address) static void decode_address(char *buf, unsigned long address)
{ {
unsigned long sym_addr; unsigned long sym_addr;
void *paddr = (void *)address;
const char *sym = symbol_lookup(address, &sym_addr); const char *sym = symbol_lookup(address, &sym_addr);
if (sym) { if (sym) {
sprintf(buf, "<0x%p> { %s + 0x%x }", address, sym, address - sym_addr); sprintf(buf, "<0x%p> { %s + 0x%lx }", paddr, sym, address - sym_addr);
return; return;
} }
if (!address) if (!address)
sprintf(buf, "<0x%p> /* Maybe null pointer? */", address); sprintf(buf, "<0x%p> /* Maybe null pointer? */", paddr);
else if (address >= CONFIG_SYS_MONITOR_BASE && else if (address >= CONFIG_SYS_MONITOR_BASE &&
address < CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) address < CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
sprintf(buf, "<0x%p> /* somewhere in u-boot */", address); sprintf(buf, "<0x%p> /* somewhere in u-boot */", paddr);
else else
sprintf(buf, "<0x%p> /* unknown address */", address); sprintf(buf, "<0x%p> /* unknown address */", paddr);
} }
static char *strhwerrcause(uint16_t hwerrcause) static char *strhwerrcause(uint16_t hwerrcause)
@ -260,7 +261,7 @@ static char *strexcause(uint16_t excause)
void dump(struct pt_regs *fp) void dump(struct pt_regs *fp)
{ {
char buf[150]; char buf[150];
size_t i; int i;
uint16_t hwerrcause, excause; uint16_t hwerrcause, excause;
if (!ENABLE_DUMP) if (!ENABLE_DUMP)
@ -275,8 +276,8 @@ void dump(struct pt_regs *fp)
printf("SEQUENCER STATUS:\n"); printf("SEQUENCER STATUS:\n");
printf(" SEQSTAT: %08lx IPEND: %04lx SYSCFG: %04lx\n", printf(" SEQSTAT: %08lx IPEND: %04lx SYSCFG: %04lx\n",
fp->seqstat, fp->ipend, fp->syscfg); fp->seqstat, fp->ipend, fp->syscfg);
printf(" HWERRCAUSE: 0x%lx: %s\n", hwerrcause, strhwerrcause(hwerrcause)); printf(" HWERRCAUSE: 0x%x: %s\n", hwerrcause, strhwerrcause(hwerrcause));
printf(" EXCAUSE : 0x%lx: %s\n", excause, strexcause(excause)); printf(" EXCAUSE : 0x%x: %s\n", excause, strexcause(excause));
for (i = 6; i <= 15; ++i) { for (i = 6; i <= 15; ++i) {
if (fp->ipend & (1 << i)) { if (fp->ipend & (1 << i)) {
decode_address(buf, bfin_read32(EVT0 + 4*i)); decode_address(buf, bfin_read32(EVT0 + 4*i));
@ -310,7 +311,7 @@ void dump(struct pt_regs *fp)
printf(" P0 : %08lx P1 : %08lx P2 : %08lx P3 : %08lx\n", printf(" P0 : %08lx P1 : %08lx P2 : %08lx P3 : %08lx\n",
fp->p0, fp->p1, fp->p2, fp->p3); fp->p0, fp->p1, fp->p2, fp->p3);
printf(" P4 : %08lx P5 : %08lx FP : %08lx SP : %08lx\n", printf(" P4 : %08lx P5 : %08lx FP : %08lx SP : %08lx\n",
fp->p4, fp->p5, fp->fp, fp); fp->p4, fp->p5, fp->fp, (unsigned long)fp);
printf(" LB0: %08lx LT0: %08lx LC0: %08lx\n", printf(" LB0: %08lx LT0: %08lx LC0: %08lx\n",
fp->lb0, fp->lt0, fp->lc0); fp->lb0, fp->lt0, fp->lc0);
printf(" LB1: %08lx LT1: %08lx LC1: %08lx\n", printf(" LB1: %08lx LT1: %08lx LC1: %08lx\n",
@ -336,7 +337,7 @@ void dump_bfin_trace_buffer(void)
{ {
char buf[150]; char buf[150];
unsigned long tflags; unsigned long tflags;
size_t i = 0; int i = 0;
if (!ENABLE_DUMP) if (!ENABLE_DUMP)
return; return;

2
lib_blackfin/boot.c
View file

@ -47,7 +47,7 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
appl = (int (*)(char *))images->ep; appl = (int (*)(char *))images->ep;
printf("Starting Kernel at = %x\n", appl); printf("Starting Kernel at = %p\n", appl);
cmdline = make_command_line(); cmdline = make_command_line();
icache_disable(); icache_disable();
dcache_disable(); dcache_disable();