Skip to contentSkip to conversation

ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds.

PATCH New Santosh Shilimkar 2 participants 2 messages Jul 6, 2012 – Jul 9, 2012

Subsystems (2)
Arm (32-bit) Arm sub-architectures
lore
Share & tools
lore

Santosh Shilimkar

author
#0 lore raw

PATCH 1/1 ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds.

OMAP4 only build breaks with below error

arch/arm/mach-omap2/sdrc.c:135: error: redefinition of 'omap2_sdrc_init' arch/arm/plat-omap/include/plat/sdrc.h:130: note: previous definition of 'omap2_sdrc_init' was here make[1]: *** [arch/arm/mach-omap2/sdrc.o] Error 1

Fix the same by using newly introduced CONFIG_SOC_HAS_OMAP2_SDRC marco.

Cc Tony Lindgren <[email protected]>
Signed-off-by Santosh Shilimkar <[email protected]>
---
 arch/arm/plat-omap/include/plat/sdrc.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/plat-omap/include/plat/sdrc.h +1 -1
index 9bb978e..36d6a76 100644
@@ -123,7 +123,7 @@ struct omap_sdrc_params {
 	u32 mr;
 };
 
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
+#ifdef CONFIG_SOC_HAS_OMAP2_SDRC
 void omap2_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
 			    struct omap_sdrc_params *sdrc_cs1);
 #else
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds.

Quoted 7 lines · Santosh Shilimkar

OMAP4 only build breaks with below error

arch/arm/mach-omap2/sdrc.c:135: error: redefinition of 'omap2_sdrc_init' arch/arm/plat-omap/include/plat/sdrc.h:130: note: previous definition of 'omap2_sdrc_init' was here make[1]: *** [arch/arm/mach-omap2/sdrc.o] Error 1

Fix the same by using newly introduced CONFIG_SOC_HAS_OMAP2_SDRC marco.

Thanks, applying into cleanup-part2.

Tony

Quoted 22 lines
Cc Tony Lindgren <[email protected]>
Signed-off-by Santosh Shilimkar <[email protected]>
---
 arch/arm/plat-omap/include/plat/sdrc.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/plat-omap/include/plat/sdrc.h +1 -1
index 9bb978e..36d6a76 100644
@@ -123,7 +123,7 @@ struct omap_sdrc_params {
 	u32 mr;
 };
 
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
+#ifdef CONFIG_SOC_HAS_OMAP2_SDRC
 void omap2_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
 			    struct omap_sdrc_params *sdrc_cs1);
 #else
Signature · 1 line
1.7.9.5