]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
mmc: mmc: Don't use sprintf when using tiny-printf
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>
Fri, 4 Dec 2015 22:27:40 +0000 (23:27 +0100)
committerSimon Glass <sjg@chromium.org>
Mon, 14 Dec 2015 00:07:31 +0000 (17:07 -0700)
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 <sjoerd.simons@collabora.co.uk>
drivers/mmc/mmc.c

index 2a58702848b7f977bd3d10b12bd9138287fc1df5..3a34028c9177ef1d917910dfd61a7c4b14e12749 100644 (file)
@@ -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);