diff options
| author | Tom Rini <trini@konsulko.com> | 2015-12-16 14:50:03 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-12-16 14:50:03 -0500 |
| commit | 35065cdd94a41dee4882b921f9763742e44d1c58 (patch) | |
| tree | aaa4a4ecdad344cb50427eb79f3a91c3311b2d3f /drivers | |
| parent | 52bc7c7e2b31d6ba8d394f3d22b551abfa365363 (diff) | |
| parent | 47b4c228b5ae72598dc38ca2764c11ea1c6693cc (diff) | |
| download | blackbird-obmc-uboot-35065cdd94a41dee4882b921f9763742e44d1c58.tar.gz blackbird-obmc-uboot-35065cdd94a41dee4882b921f9763742e44d1c58.zip | |
Merge git://git.denx.de/u-boot-rockchip
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/mmc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 2a58702848..3a34028c91 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1469,7 +1469,9 @@ static int mmc_startup(struct mmc *mmc) mmc->block_dev.blksz = mmc->read_bl_len; mmc->block_dev.log2blksz = LOG2(mmc->block_dev.blksz); mmc->block_dev.lba = lldiv(mmc->capacity, mmc->read_bl_len); -#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT) +#if !defined(CONFIG_SPL_BUILD) || \ + (defined(CONFIG_SPL_LIBCOMMON_SUPPORT) && \ + !defined(CONFIG_USE_TINY_PRINTF)) sprintf(mmc->block_dev.vendor, "Man %06x Snr %04x%04x", mmc->cid[0] >> 24, (mmc->cid[2] & 0xffff), (mmc->cid[3] >> 16) & 0xffff); |
