From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Roese Date: Tue, 14 Jul 2009 10:39:35 +0200 Subject: [U-Boot] Canyonlands does not build anymore In-Reply-To: <48D3D52125C49B43AE880038E2E5314B025D0C@SRV101.gdsys.de> References: <48D3D52125C49B43AE880038E2E5314B025D0C@SRV101.gdsys.de> Message-ID: <200907141039.35945.sr@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 =====================================================================