diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-21 15:20:42 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-21 15:20:42 -0400 |
| commit | bdcb29960e3a9558803632783b922f26993d219e (patch) | |
| tree | c0c343ca723b8736b74af172bb47f1007dc2fc5c /drivers/net | |
| parent | 1bf65142b31a48c8e354df603c9f6fa5c8cac389 (diff) | |
| parent | e174fb7061e7a3f1996f57eb36525c51dd87b5a3 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
- Backplane support and bug fixes
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/fm/fm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c index 926cf81a07..7a081b9d03 100644 --- a/drivers/net/fm/fm.c +++ b/drivers/net/fm/fm.c @@ -360,6 +360,7 @@ int fm_init_common(int index, struct ccsr_fman *reg) if (src == BOOT_SOURCE_IFC_NOR) { addr = (void *)(CONFIG_SYS_FMAN_FW_ADDR + CONFIG_SYS_FSL_IFC_BASE); +#ifdef CONFIG_CMD_NAND } else if (src == BOOT_SOURCE_IFC_NAND) { size_t fw_length = CONFIG_SYS_QE_FMAN_FW_LENGTH; @@ -372,6 +373,7 @@ int fm_init_common(int index, struct ccsr_fman *reg) printf("NAND read of FMAN firmware at offset 0x%x failed %d\n", CONFIG_SYS_FMAN_FW_ADDR, rc); } +#endif } else if (src == BOOT_SOURCE_QSPI_NOR) { struct spi_flash *ucode_flash; |