Patchwork [U-Boot] powerpc/85xx: Fix compile warnings/errors if CONFIG_SYS_DPAA_FMAN isn't set

login
register
mail settings
Submitter Kumar Gala
Date Aug. 1, 2011, 6:20 a.m.
Message ID <1312179648-27735-1-git-send-email-galak@kernel.crashing.org>
Download mbox | patch
Permalink /patch/107664/
State Accepted
Commit e2d0f255cf730ba56c6531a1bdadd347800d9cca
Delegated to: Kumar Gala
Headers show

Comments

Kumar Gala - Aug. 1, 2011, 6:20 a.m.
Add ifdef protection around fman specific code related to device tree
clock setup.  If we dont have CONFIG_SYS_DPAA_FMAN defined we shouldn't
be executing this code.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 arch/powerpc/cpu/mpc85xx/fdt.c     |    4 ++++
 arch/powerpc/cpu/mpc85xx/portals.c |    5 ++++-
 2 files changed, 8 insertions(+), 1 deletions(-)
Kumar Gala - Aug. 26, 2011, 7:08 p.m.
On Aug 1, 2011, at 1:20 AM, Kumar Gala wrote:

> Add ifdef protection around fman specific code related to device tree
> clock setup.  If we dont have CONFIG_SYS_DPAA_FMAN defined we shouldn't
> be executing this code.
> 
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---
> arch/powerpc/cpu/mpc85xx/fdt.c     |    4 ++++
> arch/powerpc/cpu/mpc85xx/portals.c |    5 ++++-
> 2 files changed, 8 insertions(+), 1 deletions(-)

applied to 85xx next

- k

Patch

diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index 8f13cd8..d20c94c 100644
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -361,6 +361,7 @@  void fdt_add_enet_stashing(void *fdt)
 }
 
 #if defined(CONFIG_SYS_DPAA_FMAN) || defined(CONFIG_SYS_DPAA_PME)
+#ifdef CONFIG_SYS_DPAA_FMAN
 static void ft_fixup_clks(void *blob, const char *compat, u32 offset,
 			  unsigned long freq)
 {
@@ -374,12 +375,14 @@  static void ft_fixup_clks(void *blob, const char *compat, u32 offset,
 				"for %s: %s\n", compat, fdt_strerror(off));
 	}
 }
+#endif
 
 static void ft_fixup_dpaa_clks(void *blob)
 {
 	sys_info_t sysinfo;
 
 	get_sys_info(&sysinfo);
+#ifdef CONFIG_SYS_DPAA_FMAN
 	ft_fixup_clks(blob, "fsl,fman", CONFIG_SYS_FSL_FM1_OFFSET,
 			sysinfo.freqFMan[0]);
 
@@ -387,6 +390,7 @@  static void ft_fixup_dpaa_clks(void *blob)
 	ft_fixup_clks(blob, "fsl,fman", CONFIG_SYS_FSL_FM2_OFFSET,
 			sysinfo.freqFMan[1]);
 #endif
+#endif
 
 #ifdef CONFIG_SYS_DPAA_PME
 	do_fixup_by_compat_u32(blob, "fsl,pme",
diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c
index ecaa30d..65635e7 100644
--- a/arch/powerpc/cpu/mpc85xx/portals.c
+++ b/arch/powerpc/cpu/mpc85xx/portals.c
@@ -198,7 +198,10 @@  void fdt_fixup_qportals(void *blob)
 		u32 liodns[2];
 #endif
 		const int *ci = fdt_getprop(blob, off, "cell-index", NULL);
-		int j, i = *ci;
+		int i = *ci;
+#ifdef CONFIG_SYS_DPAA_FMAN
+		int j;
+#endif
 
 		err = fdt_setprop(blob, off, "compatible", compat, compat_len);
 		if (err < 0)