From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter Tyser <ptyser@xes-inc.com>
Date: Wed, 04 Nov 2009 18:09:06 -0600
Subject: [U-Boot] [PATCH] ppc/85xx: Fix inclusion of 83xx immap in 85xx
 builds
In-Reply-To: <1257379414-16527-1-git-send-email-galak@kernel.crashing.org>
References: <1257379414-16527-1-git-send-email-galak@kernel.crashing.org>
Message-ID: <1257379746.21380.3.camel@localhost.localdomain>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On Wed, 2009-11-04 at 18:03 -0600, Kumar Gala wrote:
> The nand_boot_fsl_elbc.c is shared between 83xx & 85xx however we should
> not be including the immap_83xx.h when building 85xx.
> 
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---
>  nand_spl/nand_boot_fsl_elbc.c |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/nand_spl/nand_boot_fsl_elbc.c b/nand_spl/nand_boot_fsl_elbc.c
> index 7f14a6f..1d79f11 100644
> --- a/nand_spl/nand_boot_fsl_elbc.c
> +++ b/nand_spl/nand_boot_fsl_elbc.c
> @@ -25,7 +25,12 @@
>  
>  #include <common.h>
>  #include <asm/io.h>
> +#ifdef CONFIG_MPC83xx
>  #include <asm/immap_83xx.h>
> +#endif
> +#ifdef CONFIG_MPC85xx
> +#include <asm/immap_85xx.h>
> +#endif
>  #include <asm/fsl_lbc.h>
>  #include <linux/mtd/nand.h>

Hi Kumar,
I believe common.h should already include the necessary asm/immap_8Xxx.h
header file, so none of the immap includes are necessary here.

Best,
Peter