diff options
| author | Tom Rini <trini@konsulko.com> | 2016-09-26 13:24:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-26 17:10:56 -0400 |
| commit | cbe7706ab8aab06c18edaa9b120371f9c8012728 (patch) | |
| tree | ebbfacedf031c33969d8d2e4d7459904b7fc1647 /drivers/net/fm/fm.c | |
| parent | 8f2fe0c86c56175dd7d5d0e3bc26bef41f224f03 (diff) | |
| parent | 295a24b3d6a751b79373e7ff2199d91765cae8a9 (diff) | |
Merge git://git.denx.de/u-boot-fsl-qoriq
trini: Drop local memset() from
examples/standalone/mem_to_mem_idma2intr.c
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/net/fm/fm.c')
| -rw-r--r-- | drivers/net/fm/fm.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c index ce4a30731f..89f0d6a14e 100644 --- a/drivers/net/fm/fm.c +++ b/drivers/net/fm/fm.c @@ -368,8 +368,18 @@ int fm_init_common(int index, struct ccsr_fman *reg) void *addr = malloc(CONFIG_SYS_QE_FMAN_FW_LENGTH); int ret = 0; +#ifdef CONFIG_DM_SPI_FLASH + struct udevice *new; + + /* speed and mode will be read from DT */ + ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS, + 0, 0, &new); + + ucode_flash = dev_get_uclass_priv(new); +#else ucode_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS, CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE); +#endif if (!ucode_flash) printf("SF: probe for ucode failed\n"); else { |