diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-07-04 23:36:11 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-07-04 23:36:11 +0200 |
| commit | f12d4cb48a1040c25a55148d0eedee1a896364e6 (patch) | |
| tree | 8d7e6120f059a2436d3e21db3644994c24b6ea2d /drivers/mtd/spi/spi_flash.c | |
| parent | a5496a180b3b6fd9feac6dc51822167892879470 (diff) | |
| parent | b376bbb49f42ed8ea566ca1b3e440240204008ca (diff) | |
Merge branch 'sf' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'drivers/mtd/spi/spi_flash.c')
| -rw-r--r-- | drivers/mtd/spi/spi_flash.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index 612f819dc29..ea875dc812b 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -106,7 +106,7 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, spi = spi_setup_slave(bus, cs, max_hz, spi_mode); if (!spi) { - debug("SF: Failed to set up slave\n"); + printf("SF: Failed to set up slave\n"); return NULL; } @@ -147,6 +147,7 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, #endif #ifdef CONFIG_SPI_FLASH_STMICRO case 0x20: + case 0xff: /* Let the stmicro func handle non-JEDEC ids */ flash = spi_flash_probe_stmicro(spi, idcode); break; #endif @@ -156,7 +157,7 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, break; #endif default: - debug("SF: Unsupported manufacturer %02X\n", idcode[0]); + printf("SF: Unsupported manufacturer %02X\n", idcode[0]); flash = NULL; break; } |