summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorYork Sun <yorksun@freescale.com>2013-06-25 11:37:40 -0700
committerYork Sun <yorksun@freescale.com>2013-08-09 12:41:38 -0700
commit7adefb55adf3e55f3788c3b9682ba91d29da2595 (patch)
treea6b55071bb55e9ec9bcd250a476dcdb2f4a4ffae /drivers
parentd2ab4bbc7b709e8c4c17784a96aae25cc1196425 (diff)
downloadblackbird-obmc-uboot-7adefb55adf3e55f3788c3b9682ba91d29da2595.tar.gz
blackbird-obmc-uboot-7adefb55adf3e55f3788c3b9682ba91d29da2595.zip
drivers/fm: Fix compiling error if FW location is not defined
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/fm/fm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c
index 4bc8f35a1c..bca20b3330 100644
--- a/drivers/net/fm/fm.c
+++ b/drivers/net/fm/fm.c
@@ -396,6 +396,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 */
OpenPOWER on IntegriCloud