From: Simon Glass <sjg@chromium.org>
Date: Tue, 29 Dec 2015 12:22:47 +0000 (-0700)
Subject: dm: spi_flash: Allow the uclass to work without printf()
X-Git-Tag: v2016.03-rc1~305^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3c8fb12b77849400ffc04737c113a7acff7d7f18;p=u-boot

dm: spi_flash: Allow the uclass to work without printf()

For SPL we don't really need sprintf() and with tiny-printf this is not
available. Allow this to be dropped in SPL when using tiny-printf.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c
index 95ffad476d..19de964e61 100644
--- a/drivers/mtd/spi/sf-uclass.c
+++ b/drivers/mtd/spi/sf-uclass.c
@@ -55,11 +55,17 @@ int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs,
 {
 	struct spi_slave *slave;
 	struct udevice *bus;
-	char name[30], *str;
+	char *str;
 	int ret;
 
+#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_USE_TINY_PRINTF)
+	str = "spi_flash";
+#else
+	char name[30];
+
 	snprintf(name, sizeof(name), "spi_flash@%d:%d", busnum, cs);
 	str = strdup(name);
+#endif
 	ret = spi_get_bus_and_cs(busnum, cs, max_hz, spi_mode,
 				  "spi_flash_std", str, &bus, &slave);
 	if (ret)