Merge branch 'master' of /home/wd/git/u-boot/custodians
This commit is contained in:
commit
695a29b768
@ -81,7 +81,7 @@ phys_size_t initdram(int board_type)
|
||||
unmap_physmem(sdram_base, EBI_SDRAM_SIZE);
|
||||
|
||||
if (expected_size != actual_size)
|
||||
printf("Warning: Only %u of %u MiB SDRAM is working\n",
|
||||
printf("Warning: Only %lu of %lu MiB SDRAM is working\n",
|
||||
actual_size >> 20, expected_size >> 20);
|
||||
|
||||
return actual_size;
|
||||
|
@ -104,7 +104,7 @@ phys_size_t initdram(int board_type)
|
||||
unmap_physmem(sdram_base, EBI_SDRAM_SIZE);
|
||||
|
||||
if (expected_size != actual_size)
|
||||
printf("Warning: Only %u of %u MiB SDRAM is working\n",
|
||||
printf("Warning: Only %lu of %lu MiB SDRAM is working\n",
|
||||
actual_size >> 20, expected_size >> 20);
|
||||
|
||||
return actual_size;
|
||||
|
@ -70,7 +70,7 @@ unsigned long flash_init(void)
|
||||
|
||||
void flash_print_info(flash_info_t *info)
|
||||
{
|
||||
printf("Flash: Vendor ID: 0x%02x, Product ID: 0x%02x\n",
|
||||
printf("Flash: Vendor ID: 0x%02lx, Product ID: 0x%02lx\n",
|
||||
info->flash_id >> 16, info->flash_id & 0xffff);
|
||||
printf("Size: %ld MB in %d sectors\n",
|
||||
info->size >> 10, info->sector_count);
|
||||
|
@ -135,10 +135,10 @@ mmc_cmd(unsigned long cmd, unsigned long arg,
|
||||
status = mmci_readl(SR);
|
||||
} while (!(status & MMCI_BIT(CMDRDY)));
|
||||
|
||||
pr_debug("mmc: status 0x%08lx\n", status);
|
||||
pr_debug("mmc: status 0x%08x\n", status);
|
||||
|
||||
if (status & error_flags) {
|
||||
printf("mmc: command %lu failed (status: 0x%08lx)\n",
|
||||
printf("mmc: command %lu failed (status: 0x%08x)\n",
|
||||
cmd, status);
|
||||
return -EIO;
|
||||
}
|
||||
@ -245,7 +245,7 @@ out:
|
||||
|
||||
read_error:
|
||||
mmc_cmd(MMC_CMD_SEND_STATUS, mmc_rca << 16, &card_status, R1 | NCR);
|
||||
printf("mmc: bread failed, status = %08x, card status = %08x\n",
|
||||
printf("mmc: bread failed, status = %08x, card status = %08lx\n",
|
||||
status, card_status);
|
||||
goto out;
|
||||
}
|
||||
@ -284,13 +284,13 @@ static void sd_parse_cid(struct mmc_cid *cid, unsigned long *resp)
|
||||
|
||||
static void mmc_dump_cid(const struct mmc_cid *cid)
|
||||
{
|
||||
printf("Manufacturer ID: %02lX\n", cid->mid);
|
||||
printf("OEM/Application ID: %04lX\n", cid->oid);
|
||||
printf("Manufacturer ID: %02X\n", cid->mid);
|
||||
printf("OEM/Application ID: %04X\n", cid->oid);
|
||||
printf("Product name: %s\n", cid->pnm);
|
||||
printf("Product Revision: %lu.%lu\n",
|
||||
printf("Product Revision: %u.%u\n",
|
||||
cid->prv >> 4, cid->prv & 0x0f);
|
||||
printf("Product Serial Number: %lu\n", cid->psn);
|
||||
printf("Manufacturing Date: %02lu/%02lu\n",
|
||||
printf("Manufacturing Date: %02u/%02u\n",
|
||||
cid->mdt >> 4, cid->mdt & 0x0f);
|
||||
}
|
||||
|
||||
@ -501,7 +501,7 @@ int mmc_init(int verbose)
|
||||
mmc_blkdev.part_type = PART_TYPE_DOS;
|
||||
mmc_blkdev.block_read = mmc_bread;
|
||||
sprintf((char *)mmc_blkdev.vendor,
|
||||
"Man %02x%04x Snr %08x",
|
||||
"Man %02x%04x Snr %08lx",
|
||||
cid.mid, cid.oid, cid.psn);
|
||||
strncpy((char *)mmc_blkdev.product, cid.pnm,
|
||||
sizeof(mmc_blkdev.product));
|
||||
|
@ -205,7 +205,7 @@ static int dataflash_write_at45(struct spi_flash *flash,
|
||||
byte_addr = 0;
|
||||
}
|
||||
|
||||
debug("SF: AT45: Successfully programmed %u bytes @ 0x%x\n",
|
||||
debug("SF: AT45: Successfully programmed %zu bytes @ 0x%x\n",
|
||||
len, offset);
|
||||
ret = 0;
|
||||
|
||||
@ -268,7 +268,7 @@ int dataflash_erase_at45(struct spi_flash *flash, u32 offset, size_t len)
|
||||
page_addr++;
|
||||
}
|
||||
|
||||
debug("SF: AT45: Successfully erased %u bytes @ 0x%x\n",
|
||||
debug("SF: AT45: Successfully erased %zu bytes @ 0x%x\n",
|
||||
len, offset);
|
||||
ret = 0;
|
||||
|
||||
@ -351,7 +351,7 @@ struct spi_flash *spi_flash_probe_atmel(struct spi_slave *spi, u8 *idcode)
|
||||
* params->blocks_per_sector
|
||||
* params->nr_sectors;
|
||||
|
||||
debug("SF: Detected %s with page size %u, total %u bytes\n",
|
||||
debug("SF: Detected %s with page size %lu, total %u bytes\n",
|
||||
params->name, page_size, asf->flash.size);
|
||||
|
||||
return &asf->flash;
|
||||
|
@ -22,6 +22,8 @@
|
||||
#ifndef __ASM_AVR32_IO_H
|
||||
#define __ASM_AVR32_IO_H
|
||||
|
||||
#include <asm/types.h>
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
/*
|
||||
|
@ -273,7 +273,9 @@
|
||||
| SYSREG_BF(name,value))
|
||||
|
||||
/* Register access macros */
|
||||
#define sysreg_read(reg) __builtin_mfsr(SYSREG_##reg)
|
||||
#define sysreg_write(reg, value) __builtin_mtsr(SYSREG_##reg, value)
|
||||
#define sysreg_read(reg) \
|
||||
((unsigned long)__builtin_mfsr(SYSREG_##reg))
|
||||
#define sysreg_write(reg, value) \
|
||||
__builtin_mtsr(SYSREG_##reg, value)
|
||||
|
||||
#endif /* __ASM_AVR32_SYSREG_H__ */
|
||||
|
Loading…
Reference in New Issue
Block a user