| Message ID | 20200408134812.27116-1-fgervais@distech-controls.com |
|---|---|
| State | Accepted |
| Commit | 402ef4d2447fee1d615c9689bc545e537d21e46f |
| Headers | show |
| Series | [1/1] net: fm: fix build error when not using nand | expand |
>-----Original Message----- >From: U-Boot <u-boot-bounces at lists.denx.de> On Behalf Of Francois Gervais >Sent: Wednesday, April 8, 2020 7:18 PM >To: u-boot at lists.denx.de >Cc: grygorii.strashko at ti.com; Rajesh Bhagat <rajesh.bhagat at nxp.com>; >Gervais, Francois <FGervais at distech-controls.com> >Subject: [PATCH 1/1] net: fm: fix build error when not using nand > >If CONFIG_CMD_NAND is disabled, get_nand_dev_by_index() is not >accessible. > >This fix allows the build to succeed in this case. > >Signed-off-by: Francois Gervais <fgervais at distech-controls.com> >--- Applied to fsl-qoriq. Awaiting upstream. Thanks Priyanka
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;
If CONFIG_CMD_NAND is disabled, get_nand_dev_by_index() is not accessible. This fix allows the build to succeed in this case. Signed-off-by: Francois Gervais <fgervais at distech-controls.com> --- drivers/net/fm/fm.c | 2 ++ 1 file changed, 2 insertions(+)