diff options
| author | Tom Rini <trini@konsulko.com> | 2019-10-08 18:45:26 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-08 18:45:26 -0400 |
| commit | efea5a34bb5be542630ce7161bd3b9cc26a0bcf3 (patch) | |
| tree | fb747d83d81f9c3400a561782114e4c6ecd61a07 /drivers/mtd/spi/sf-uclass.c | |
| parent | 9d536fe8ae7672bdee091f9100389b6f3e53cfc6 (diff) | |
| parent | cc2d27dcdc3e1c76d09d54015e3992380bd7e0fa (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- Rename existing FSP code to fsp1
- Add fsp2 directory in preparation to support FSP 2.0
- Various x86 platform codes update
- Various bug fixes and updates in dm core, sandbox and spl
Diffstat (limited to 'drivers/mtd/spi/sf-uclass.c')
| -rw-r--r-- | drivers/mtd/spi/sf-uclass.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c index 719a2fd23ae..c6107522be0 100644 --- a/drivers/mtd/spi/sf-uclass.c +++ b/drivers/mtd/spi/sf-uclass.c @@ -66,7 +66,7 @@ int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs, char *str; int ret; -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_USE_TINY_PRINTF) +#if defined(CONFIG_SPL_BUILD) && CONFIG_IS_ENABLED(USE_TINY_PRINTF) str = "spi_flash"; #else char name[30]; |