diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-07-31 12:30:40 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-31 12:30:40 +0200 |
| commit | f7c602ac8be0bcff4e573052c47e79bc46dab380 (patch) | |
| tree | b987f7a2e05fc81167335ec949b17cbc9cd67df3 /drivers/mmc | |
| parent | 3c95960e526b3b026da20201db64526f46faf14b (diff) | |
| parent | 9196b44334c330cc13de2464c59181e4db71f549 (diff) | |
| download | u-boot-imx-f7c602ac8be0bcff4e573052c47e79bc46dab380.zip u-boot-imx-f7c602ac8be0bcff4e573052c47e79bc46dab380.tar.gz u-boot-imx-f7c602ac8be0bcff4e573052c47e79bc46dab380.tar.bz2 | |
Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/atmel_mci.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/mmc/atmel_mci.c b/drivers/mmc/atmel_mci.c index 61aa184..a151488 100644 --- a/drivers/mmc/atmel_mci.c +++ b/drivers/mmc/atmel_mci.c @@ -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)); |