[U-Boot] [PATCH] ppc/85xx: Fix inclusion of 83xx immap in 85xx builds

Kumar Gala galak at kernel.crashing.org
Thu Nov 5 01:03:34 CET 2009


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



More information about the U-Boot mailing list