All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/1] net: fm: fix build error when not using nand
@ 2020-04-08 13:48 Francois Gervais
  2020-04-21 10:12 ` Priyanka Jain
  0 siblings, 1 reply; 2+ messages in thread
From: Francois Gervais @ 2020-04-08 13:48 UTC (permalink / raw)
  To: u-boot

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@distech-controls.com>
---
 drivers/net/fm/fm.c | 2 ++
 1 file changed, 2 insertions(+)

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;
 
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [PATCH 1/1] net: fm: fix build error when not using nand
  2020-04-08 13:48 [PATCH 1/1] net: fm: fix build error when not using nand Francois Gervais
@ 2020-04-21 10:12 ` Priyanka Jain
  0 siblings, 0 replies; 2+ messages in thread
From: Priyanka Jain @ 2020-04-21 10:12 UTC (permalink / raw)
  To: u-boot

>-----Original Message-----
>From: U-Boot <u-boot-bounces@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@nxp.com>;
>Gervais, Francois <FGervais@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@distech-controls.com>
>---
Applied to fsl-qoriq. Awaiting upstream.

Thanks
Priyanka

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-04-21 10:12 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-08 13:48 [PATCH 1/1] net: fm: fix build error when not using nand Francois Gervais
2020-04-21 10:12 ` Priyanka Jain

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.