Patchwork [U-Boot,02/11] drivers/fm: Fix compiling error if FW location is not defined

login
register
mail settings
Submitter York Sun
Date June 25, 2013, 6:37 p.m.
Message ID <1372185469-14161-2-git-send-email-yorksun@freescale.com>
Download mbox | patch
Permalink /patch/254283/
State Accepted
Delegated to: Andy Fleming
Headers show

Comments

York Sun - June 25, 2013, 6:37 p.m.
FMAN firmware can be in NOR flash, NAND flash, SPI flash, MMC or even
remote. In case none of them is defined, set it to null.

Signed-off-by: York Sun <yorksun@freescale.com>
---
 drivers/net/fm/fm.c |    2 ++
 1 file changed, 2 insertions(+)

Patch

diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c
index 8d70586..0b1a8e5 100644
--- a/drivers/net/fm/fm.c
+++ b/drivers/net/fm/fm.c
@@ -409,6 +409,8 @@  int fm_init_common(int index, struct ccsr_fman *reg)
 	}
 #elif defined(CONFIG_SYS_QE_FMAN_FW_IN_REMOTE)
 	void *addr = (void *)CONFIG_SYS_QE_FMAN_FW_ADDR;
+#else
+	void *addr = NULL;
 #endif
 
 	/* Upload the Fman microcode if it's present */