ppc/85xx: Fix inclusion of 83xx immap in 85xx builds
PATCH 1/1 ppc/85xx: Fix inclusion of 83xx immap in 85xx builds
The nand_boot_fsl_elbc.c is shared between 83xx & 85xx however we should not be including the immap_83xx.h when building 85xx.
--- nand_spl/nand_boot_fsl_elbc.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
nand_spl/nand_boot_fsl_elbc.c +5 -0
@@ -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>
Signature · 1 line
1.6.0.6
Kumar Gala
AppliedPATCH 1/1 ppc/85xx: Fix inclusion of 83xx immap in 85xx builds
Quoted 8 lines · Kumar Gala
The
nand_boot_fsl_elbc.cis shared between 83xx & 85xx however we should
not be including theimmap_83xx.hwhen building 85xx.Signed-off-by Kumar Gala <[email protected]>---
nand_spl/nand_boot_fsl_elbc.c| 5 +++++1 files changed, 5 insertions(+), 0 deletions(-)
applied to 85xx.
- k
PATCH 1/1 ppc/85xx: Fix inclusion of 83xx immap in 85xx builds
In reply to Kumar GalaQuoted 14 lines · Kumar Gala
The
nand_boot_fsl_elbc.cis shared between 83xx & 85xx however we should not be including theimmap_83xx.hwhen building 85xx.Signed-off-by Kumar Gala <[email protected]>--- nand_spl/nand_boot_fsl_elbc.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)nand_spl/nand_boot_fsl_elbc.c +0
-0@@ -25,7 +25,12 @@
nand_spl/nand_boot_fsl_elbc.c line 35
Quoted 10 lines
nand_spl/nand_boot_fsl_elbc.c +5
-0#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