diff options
| author | Tom Rini <trini@konsulko.com> | 2020-09-25 12:55:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-25 12:55:06 -0400 |
| commit | 253388acd6d0d52205ed9a32282f990e055bb87d (patch) | |
| tree | a84e1d53a94b4ea3dbf1d1994ebf02606aa41503 /drivers/net/pfe_eth/pfe_firmware.c | |
| parent | 1da91d9bcd6e5ef046c1df0d373d0df87b1e8a72 (diff) | |
| parent | 8ec619f8fd847eb80d75fa0a582e1fa3c74a21a7 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
- Bug fixes related to PCIe, pfe, xfi, gpio, reset, vid, env, and usb on
layerscape products
Diffstat (limited to 'drivers/net/pfe_eth/pfe_firmware.c')
| -rw-r--r-- | drivers/net/pfe_eth/pfe_firmware.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c index 55e661c0e1d..d414c750d42 100644 --- a/drivers/net/pfe_eth/pfe_firmware.c +++ b/drivers/net/pfe_eth/pfe_firmware.c @@ -167,25 +167,23 @@ static int pfe_fit_check(void) int pfe_spi_flash_init(void) { struct spi_flash *pfe_flash; + struct udevice *new; int ret = 0; void *addr = malloc(CONFIG_SYS_QE_FMAN_FW_LENGTH); -#ifdef CONFIG_DM_SPI_FLASH - struct udevice *new; + if (!addr) + return -ENOMEM; - /* 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); + CONFIG_ENV_SPI_CS, + CONFIG_ENV_SPI_MAX_HZ, + CONFIG_ENV_SPI_MODE, + &new); pfe_flash = dev_get_uclass_priv(new); -#else - pfe_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, - CONFIG_ENV_SPI_CS, - CONFIG_ENV_SPI_MAX_HZ, - CONFIG_ENV_SPI_MODE); -#endif if (!pfe_flash) { printf("SF: probe for pfe failed\n"); + free(addr); return -ENODEV; } |