From: Sjoerd Simons Date: Fri, 4 Dec 2015 22:27:40 +0000 (+0100) Subject: mmc: mmc: Don't use sprintf when using tiny-printf X-Git-Tag: v2016.01-rc3~20^2~3 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fc011f6402d3d63fe826260fcc5940d7b7fb138e;p=u-boot mmc: mmc: Don't use sprintf when using tiny-printf There is no sprintf implementation in tiny-printf, so don't try to use it when tiny-printf if used. Signed-off-by: Sjoerd Simons --- 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);