Skip to contentSkip to conversation

net: fm: fix build error when not using nand

PATCH New Francois Gervais 2 participants 2 messages Apr 8, 2020 – Apr 21, 2020 Network drivers

lore
Share & tools
lore
#0 lore raw

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.

---
 drivers/net/fm/fm.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/net/fm/fm.c +2 -0
index 926cf81a07..7a081b9d03 100644
@@ -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;
 
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 net: fm: fix build error when not using nand

Quoted 8 lines

-----Original Message-----
From: U-Boot <[email protected]> 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 <[email protected]>; Gervais, Francois <[email protected]>
Subject: [PATCH 1/1] net: fm: fix build error when not using nand

Quoted 7 lines

If CONFIG_CMD_NAND is disabled, get_nand_dev_by_index() is not accessible.

This fix allows the build to succeed in this case.

---

Applied to fsl-qoriq. Awaiting upstream.

Thanks
Priyanka