[U-Boot] [PATCH] ppc: Fix compile error for boards with CONFIG_DDR_ECC

[U-Boot] [PATCH] ppc: Fix compile error for boards with CONFIG_DDR_ECC

[Peter Tyser]

A bug was introduced by commit e94e460c6e8741f42dab6d8dd4b596ba5d9d79ae
which affected non-MPC83xx/85xx/86xx ppc boards which had CONFIG_DDR_ECC
defined and resulted in errors such as:

Configuring for canyonlands board...
fsl_dma.c:50:2: error: #error "Freescale DMA engine not supported on your
processor"
make[1]: *** No rule to make target `.depend', needed by `libdma.a'.  Stop.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
---
 include/asm-ppc/config.h |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/asm-ppc/config.h b/include/asm-ppc/config.h
index ca143c7..c9ba805 100644
--- a/include/asm-ppc/config.h
+++ b/include/asm-ppc/config.h
@@ -29,10 +29,11 @@
 #endif
 #endif
 
-#ifndef CONFIG_FSL_DMA
-#if ((!defined CONFIG_MPC83xx && defined(CONFIG_DDR_ECC) &&	\
-	!defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)) ||		\
-	(defined(CONFIG_MPC83xx) && defined(CONFIG_DDR_ECC_INIT_VIA_DMA)))
+/* Check if boards need to enable FSL DMA engine for SDRAM init */
+#if !defined(CONFIG_FSL_DMA) && defined(CONFIG_DDR_ECC)
+#if (defined(CONFIG_MPC83xx) && defined(CONFIG_DDR_ECC_INIT_VIA_DMA)) || \
+	((defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)) && \
+	!defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER))
 #define CONFIG_FSL_DMA
 #endif
 #endif
-- 
1.6.2.1

[U-Boot] [PATCH] ppc: Fix compile error for boards with CONFIG_DDR_ECC

[Stefan Roese]

On Wednesday 15 July 2009 07:01:08 Peter Tyser wrote:
> A bug was introduced by commit e94e460c6e8741f42dab6d8dd4b596ba5d9d79ae
> which affected non-MPC83xx/85xx/86xx ppc boards which had CONFIG_DDR_ECC
> defined and resulted in errors such as:
>
> Configuring for canyonlands board...
> fsl_dma.c:50:2: error: #error "Freescale DMA engine not supported on your
> processor"
> make[1]: *** No rule to make target `.depend', needed by `libdma.a'.  Stop.
>
> Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

Thanks Peter.

Wolfgang, I suggest that you pull this patch directly so that the breakage is 
fixed.

Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

[U-Boot] [PATCH] ppc: Fix compile error for boards with CONFIG_DDR_ECC

[Wolfgang Denk]

Dear Peter Tyser,

In message <1247634068-16671-1-git-send-email-ptyser@xes-inc.com> you wrote:
> A bug was introduced by commit e94e460c6e8741f42dab6d8dd4b596ba5d9d79ae
> which affected non-MPC83xx/85xx/86xx ppc boards which had CONFIG_DDR_ECC
> defined and resulted in errors such as:
> 
> Configuring for canyonlands board...
> fsl_dma.c:50:2: error: #error "Freescale DMA engine not supported on your
> processor"
> make[1]: *** No rule to make target `.depend', needed by `libdma.a'.  Stop.
> 
> Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
> ---
>  include/asm-ppc/config.h |    9 +++++----
>  1 files changed, 5 insertions(+), 4 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Heavier than air flying machines are impossible.
                    -- Lord Kelvin, President, Royal Society, c. 1895

[U-Boot] [PATCH] ppc: Fix compile error for boards with CONFIG_DDR_ECC

[Wolfgang Denk]

Dear Stefan Roese,

In message <200907170835.50906.sr@denx.de> you wrote:
> On Wednesday 15 July 2009 07:01:08 Peter Tyser wrote:
> > A bug was introduced by commit e94e460c6e8741f42dab6d8dd4b596ba5d9d79ae
> > which affected non-MPC83xx/85xx/86xx ppc boards which had CONFIG_DDR_ECC
> > defined and resulted in errors such as:
> >
> > Configuring for canyonlands board...
> > fsl_dma.c:50:2: error: #error "Freescale DMA engine not supported on your
> > processor"
> > make[1]: *** No rule to make target `.depend', needed by `libdma.a'.  Stop.
> >
> > Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
> 
> Thanks Peter.
> 
> Wolfgang, I suggest that you pull this patch directly so that the breakage is 
> fixed.

Done.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
I'm a soldier, not a diplomat.  I can only tell the truth.
	-- Kirk, "Errand of Mercy", stardate 3198.9

[U-Boot] [PATCH] ppc: Fix compile error for boards with CONFIG_DDR_ECC

[Stefan Roese]

Hi Wolfgang,

On Friday 17 July 2009 23:45:02 Wolfgang Denk wrote:
> > > A bug was introduced by commit e94e460c6e8741f42dab6d8dd4b596ba5d9d79ae
> > > which affected non-MPC83xx/85xx/86xx ppc boards which had
> > > CONFIG_DDR_ECC defined and resulted in errors such as:
> > >
> > > Configuring for canyonlands board...
> > > fsl_dma.c:50:2: error: #error "Freescale DMA engine not supported on
> > > your processor"
> > > make[1]: *** No rule to make target `.depend', needed by `libdma.a'. 
> > > Stop.
> > >
> > > Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
> >
> > Thanks Peter.
> >
> > Wolfgang, I suggest that you pull this patch directly so that the
> > breakage is fixed.
>
> Done.

This patch is still not available in mainline.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

[U-Boot] [PATCH] ppc: Fix compile error for boards with CONFIG_DDR_ECC

[Wolfgang Denk]

Dear Stefan Roese,

In message <200907180731.42703.sr@denx.de> you wrote:
> 
> > > Wolfgang, I suggest that you pull this patch directly so that the
> > > breakage is fixed.
> >
> > Done.
> 
> This patch is still not available in mainline.

Should be visible now. I forgot to push my changes out to the public
server (you should have been able to see it on pollux, though).

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
History is only a confused heap of facts.
                                       -- Philip Earl of Chesterfield