* [U-Boot] [PATCH] ppc/85xx: Fix inclusion of 83xx immap in 85xx builds
@ 2009-11-05 0:03 Kumar Gala
2009-11-05 0:07 ` Kumar Gala
2009-11-05 0:09 ` Peter Tyser
0 siblings, 2 replies; 3+ messages in thread
From: Kumar Gala @ 2009-11-05 0:03 UTC (permalink / raw)
To: u-boot
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>
--
1.6.0.6
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] ppc/85xx: Fix inclusion of 83xx immap in 85xx builds
2009-11-05 0:03 [U-Boot] [PATCH] ppc/85xx: Fix inclusion of 83xx immap in 85xx builds Kumar Gala
@ 2009-11-05 0:07 ` Kumar Gala
2009-11-05 0:09 ` Peter Tyser
1 sibling, 0 replies; 3+ messages in thread
From: Kumar Gala @ 2009-11-05 0:07 UTC (permalink / raw)
To: u-boot
On Nov 4, 2009, at 6:03 PM, 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(-)
applied to 85xx.
- k
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] ppc/85xx: Fix inclusion of 83xx immap in 85xx builds
2009-11-05 0:03 [U-Boot] [PATCH] ppc/85xx: Fix inclusion of 83xx immap in 85xx builds Kumar Gala
2009-11-05 0:07 ` Kumar Gala
@ 2009-11-05 0:09 ` Peter Tyser
1 sibling, 0 replies; 3+ messages in thread
From: Peter Tyser @ 2009-11-05 0:09 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-11-05 0:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-05 0:03 [U-Boot] [PATCH] ppc/85xx: Fix inclusion of 83xx immap in 85xx builds Kumar Gala
2009-11-05 0:07 ` Kumar Gala
2009-11-05 0:09 ` Peter Tyser
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox