[U-Boot] [PATCH] powerpc/83xx: Fix build issue with ve8313 board due to lbus changes

[Kumar Gala]

We get two build errors:

fsl_elbc_nand.c: In function 'fsl_elbc_run_command':
fsl_elbc_nand.c:231: error: 'fsl_lbc_t' has no member named 'lsor'
make[1]: *** [/work/wd/tmp-ppc/drivers/mtd/nand/fsl_elbc_nand.o] Error 1

and

ve8313.c: In function 'initdram':
ve8313.c:104: error: expected '=', ',', ';', 'asm' or '__attribute__'
before '*' token
ve8313.c:104: error: 'lbc' undeclared (first use in this function)
ve8313.c:104: error: (Each undeclared identifier is reported only once
ve8313.c:104: error: for each function it appears in.)
ve8313.c:104: error: 'immap_t' has no member named 'lbus'
make[1]: *** [ve8313.o] Error 1
make: *** [board/ve8313/libve8313.a] Error 2

Due to changes to unifiy local bus struct definitions.

Reported-by: Wolfgang Denk <wd at denx.de>
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
---
 board/ve8313/ve8313.c            |    2 +-
 drivers/mtd/nand/fsl_elbc_nand.c |    4 +++-
 include/configs/ve8313.h         |    1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/board/ve8313/ve8313.c b/board/ve8313/ve8313.c
index 8ba1b19..2272ff0 100644
--- a/board/ve8313/ve8313.c
+++ b/board/ve8313/ve8313.c
@@ -101,7 +101,7 @@ static long fixed_sdram(void)
 phys_size_t initdram(int board_type)
 {
 	volatile immap_t *im = (volatile immap_t *)CONFIG_SYS_IMMR;
-	volatile fsl_lbus_t *lbc = &im->lbus;
+	volatile fsl_lbc_t *lbc = &im->im_lbc;
 	u32 msize;
 
 	if ((im->sysconf.immrbar & IMMRBAR_BASE_ADDR) != (u32)im)
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index acdb431..ca61daf 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -1,6 +1,6 @@
 /* Freescale Enhanced Local Bus Controller FCM NAND driver
  *
- * Copyright (c) 2006-2008 Freescale Semiconductor
+ * Copyright (c) 2006-2010 Freescale Semiconductor
  *
  * Authors: Nick Spence <nick.spence at freescale.com>,
  *          Scott Wood <scottwood at freescale.com>
@@ -227,8 +227,10 @@ static int fsl_elbc_run_command(struct mtd_info *mtd)
 	     in_be32(&lbc->fbar), in_be32(&lbc->fpar),
 	     in_be32(&lbc->fbcr), priv->bank);
 
+#ifdef CONFIG_FSL_ELBC
 	/* execute special operation */
 	out_be32(&lbc->lsor, priv->bank);
+#endif
 
 	/* wait for FCM complete flag or timeout */
 	end_tick = usec2ticks(FCM_TIMEOUT_MSECS * 1000) + get_ticks();
diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index 1589913..56d24f9 100644
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -39,6 +39,7 @@
 #define CONFIG_VE8313		1
 
 #define CONFIG_PCI		1
+#define CONFIG_FSL_ELBC		1
 
 #define CONFIG_BOARD_EARLY_INIT_F	1
 
-- 
1.6.0.6