[U-Boot] Canyonlands does not build anymore

[U-Boot] Canyonlands does not build anymore

[Eibach, Dirk]

The following commit modified include/asm-ppc/config.h so that
config_canyonlands has CONFIG_FSL_DMA active (because of
CONFIG_DDR_ECC), which is probably not intended. I'm not sure how to fix
this properly, maybe some Freescale guru could comment.

Cheers
Dirk

commit e94e460c6e8741f42dab6d8dd4b596ba5d9d79ae
Author: Peter Tyser <ptyser@xes-inc.com>
Date:   Tue Jun 30 17:15:51 2009 -0500

    83xx: Add support for fsl_dma driver

    Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
    Reviewed-by: Ira W. Snyder <iws@ovro.caltech.edu>
    Tested-by: Ira W. Snyder <iws@ovro.caltech.edu>
    Acked-by: Kim Phillips <kim.phillips@freescale.com>
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

[U-Boot] Canyonlands does not build anymore

[Stefan Roese]

Dirk,

On Tuesday 14 July 2009 10:32:36 Eibach, Dirk wrote:
> The following commit modified include/asm-ppc/config.h so that
> config_canyonlands has CONFIG_FSL_DMA active (because of
> CONFIG_DDR_ECC), which is probably not intended. I'm not sure how to fix
> this properly, maybe some Freescale guru could comment.

I already pointed this out a few days ago. Peter sent a new patchset with a 
fix for this. It's just not pushed into mainline yet.

Here a quick fix for you to being able to build Canyonlands again:

diff --git a/include/asm-ppc/config.h b/include/asm-ppc/config.h
index ca143c7..00a7208 100644
--- a/include/asm-ppc/config.h
+++ b/include/asm-ppc/config.h
@@ -29,10 +29,9 @@
 #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)))
+#if (defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || \
+     defined(CONFIG_MPC86xx)) && !defined CONFIG_FSL_DMA
+#if (defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER))
 #define CONFIG_FSL_DMA


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
=====================================================================