arm: omap: Fix errors and warnings when building for one board

PATCH Superseded Sanjeev Premi 3 participants 4 messages Oct 13, 2011 – Nov 3, 2011

Subsystems (3)

Arm (32-bit) Arm sub-architectures OMAP2+ support

lore

Share & tools

lore

Sanjeev Premi

author

2011-10-13 16:14 UTC #0 lore raw

PATCH v2 1/1 arm: omap: Fix errors and warnings when building for one board

When customizing omap2plus_defconfig to build for only one board (omap3evm), I came across these warnings and errors (filenames truncated):

arch/arm/mach-omap2/board-generic.c:76:20: warning: 'omap4_init' defined but not used arch/arm/mach-omap2/built-in.o: In function `omap2420_init_early':
arch/arm/mach-omap2/io.c:364: undefined reference to omap2_set_globals_242x' arch/arm/mach-omap2/io.c:366: undefined reference to omap2xxx_voltagedomains_init' arch/arm/mach-omap2/io.c:367: undefined reference to omap242x_powerdomains_init' arch/arm/mach-omap2/io.c:368: undefined reference to omap242x_clockdomains_init' arch/arm/mach-omap2/io.c:369: undefined reference to omap2420_hwmod_init' arch/arm/mach-omap2/built-in.o: In function omap2430_init_early':
arch/arm/mach-omap2/io.c:376: undefined reference to omap2_set_globals_243x' arch/arm/mach-omap2/io.c:378: undefined reference to omap2xxx_voltagedomains_init' arch/arm/mach-omap2/io.c:379: undefined reference to omap243x_powerdomains_init' arch/arm/mach-omap2/io.c:380: undefined reference to omap243x_clockdomains_init' arch/arm/mach-omap2/io.c:381: undefined reference to omap2430_hwmod_init' arch/arm/mach-omap2/built-in.o: In function omap4430_init_early':
arch/arm/mach-omap2/io.c:436: undefined reference to omap2_set_globals_443x' arch/arm/mach-omap2/io.c:438: undefined reference to omap44xx_voltagedomains_init' arch/arm/mach-omap2/io.c:439: undefined reference to omap44xx_powerdomains_init' arch/arm/mach-omap2/io.c:440: undefined reference to omap44xx_clockdomains_init' arch/arm/mach-omap2/io.c:441: undefined reference to `omap44xx_hwmod_init'

This patch fixes them.

Signed-off-by Sanjeev Premi <[email protected]>

---

Changes since v1:
- #if defined() to #ifdef
- Moved an #ifdef to take care of additional warning related to sdp4430_twldata. Had missed squashing the patch before sending v1.

Adding ifdefs makes the code bit ugly and is prone to propagate further. Not sure if DT will help here, but this patch would be useful for people trying to build for individual boards.

Compile tested for OMAP3EVM.

Applies to linux-omap/master at:
fb4df0f : ARM: OMAP1: Fix warnings about enabling 32 KiHz timer

 arch/arm/mach-omap2/board-generic.c |    8 ++++++++
 arch/arm/mach-omap2/io.c            |    6 ++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

arch/arm/mach-omap2/board-generic.c +8 -0

index d9ccb9d..b36003f 100644
@@ -29,6 +29,7 @@
  * XXX: Still needed to boot until the i2c & twl driver is adapted to
  * device-tree
  */
+#ifdef CONFIG_ARCH_OMAP4
 static struct twl4030_platform_data sdp4430_twldata = {
 	.irq_base	= TWL6030_IRQ_BASE,
 	.irq_end	= TWL6030_IRQ_END,

@@ -38,16 +39,19 @@ static void __init omap4_i2c_init(void)
 {
 	omap4_pmic_init("twl6030", &sdp4430_twldata);
 }
+#endif
 
 static struct twl4030_platform_data beagle_twldata = {
 	.irq_base	= TWL4030_IRQ_BASE,
 	.irq_end	= TWL4030_IRQ_END,
 };
 
+#ifdef CONFIG_ARCH_OMAP3
 static void __init omap3_i2c_init(void)
 {
 	omap3_pmic_init("twl4030", &beagle_twldata);
 }
+#endif
 
 static struct of_device_id omap_dt_match_table[] __initdata = {
 	{ .compatible = "simple-bus", },

@@ -73,17 +77,21 @@ static void __init omap_generic_init(void)
 	of_platform_populate(NULL, omap_dt_match_table, NULL, NULL);
 }
 
+#ifdef CONFIG_ARCH_OMAP4
 static void __init omap4_init(void)
 {
 	omap4_i2c_init();
 	omap_generic_init();
 }
+#endif
 
+#ifdef CONFIG_ARCH_OMAP3
 static void __init omap3_init(void)
 {
 	omap3_i2c_init();
 	omap_generic_init();
 }
+#endif
 
 #if defined(CONFIG_SOC_OMAP2420)
 static const char *omap242x_boards_compat[] __initdata = {

arch/arm/mach-omap2/io.c +6 -0

index aa96538..08c30c1 100644
@@ -359,6 +359,7 @@ static void __init omap_hwmod_init_postsetup(void)
 	omap_pm_if_early_init();
 }
 
+#ifdef CONFIG_ARCH_OMAP2
 void __init omap2420_init_early(void)
 {
 	omap2_set_globals_242x();

@@ -382,11 +383,13 @@ void __init omap2430_init_early(void)
 	omap_hwmod_init_postsetup();
 	omap2430_clk_init();
 }
+#endif
 
 /*
  * Currently only board-omap3beagle.c should call this because of the
  * same machine_id for 34xx and 36xx beagle.. Will get fixed with DT.
  */
+#ifdef CONFIG_ARCH_OMAP3
 void __init omap3_init_early(void)
 {
 	omap2_set_globals_3xxx();

@@ -430,7 +433,9 @@ void __init ti816x_init_early(void)
 	omap_hwmod_init_postsetup();
 	omap3xxx_clk_init();
 }
+#endif
 
+#ifdef CONFIG_ARCH_OMAP4
 void __init omap4430_init_early(void)
 {
 	omap2_set_globals_443x();

@@ -442,6 +447,7 @@ void __init omap4430_init_early(void)
 	omap_hwmod_init_postsetup();
 	omap4xxx_clk_init();
 }
+#endif
 
 void __init omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
 				      struct omap_sdrc_params *sdrc_cs1)

Signature · 1 line

1.7.0.4

Premi, Sanjeev

author

2011-10-28 14:10 UTC #1 lore raw

PATCH v2 1/1 arm: omap: Fix errors and warnings when building for one board

Quoted 65 lines

-----Original Message-----
From: Premi, Sanjeev
Sent: Thursday, October 13, 2011 9:44 PM
To: linux-omap at vger.kernel.org; linux-arm-kernel at lists.infradead.org
Cc: Premi, Sanjeev
Subject: [PATCH v2] arm: omap: Fix errors and warnings when building for one board
When customizing omap2plus_defconfig to build for only one board (omap3evm), I came across these warnings and errors (filenames truncated):
arch/arm/mach-omap2/board-generic.c:76:20: warning:
'omap4_init' defined but not used arch/arm/mach-omap2/built-in.o: In function `omap2420_init_early':
arch/arm/mach-omap2/io.c:364: undefined reference to `omap2_set_globals_242x'
arch/arm/mach-omap2/io.c:366: undefined reference to omap2xxx_voltagedomains_init' arch/arm/mach-omap2/io.c:367: undefined reference to omap242x_powerdomains_init' arch/arm/mach-omap2/io.c:368: undefined reference to omap242x_clockdomains_init' arch/arm/mach-omap2/io.c:369: undefined reference to omap2420_hwmod_init'
arch/arm/mach-omap2/built-in.o: In function `omap2430_init_early':
arch/arm/mach-omap2/io.c:376: undefined reference to `omap2_set_globals_243x'
arch/arm/mach-omap2/io.c:378: undefined reference to omap2xxx_voltagedomains_init' arch/arm/mach-omap2/io.c:379: undefined reference to omap243x_powerdomains_init' arch/arm/mach-omap2/io.c:380: undefined reference to omap243x_clockdomains_init' arch/arm/mach-omap2/io.c:381: undefined reference to omap2430_hwmod_init'
arch/arm/mach-omap2/built-in.o: In function `omap4430_init_early':
arch/arm/mach-omap2/io.c:436: undefined reference to `omap2_set_globals_443x'
arch/arm/mach-omap2/io.c:438: undefined reference to omap44xx_voltagedomains_init' arch/arm/mach-omap2/io.c:439: undefined reference to omap44xx_powerdomains_init' arch/arm/mach-omap2/io.c:440: undefined reference to omap44xx_clockdomains_init' arch/arm/mach-omap2/io.c:441: undefined reference to omap44xx_hwmod_init'
This patch fixes them.
Signed-off-by Sanjeev Premi <[email protected]>
---
Changes since v1:
- #if defined() to #ifdef
- Moved an #ifdef to take care of additional warning related to sdp4430_twldata. Had missed squashing the patch before sending v1.
Adding ifdefs makes the code bit ugly and is prone to propagate further. Not sure if DT will help here, but this patch would be useful for people trying to build for individual boards.
Compile tested for OMAP3EVM.

Quoted 8 lines

Applies to linux-omap/master at:
fb4df0f : ARM: OMAP1: Fix warnings about enabling 32 KiHz timer
 arch/arm/mach-omap2/board-generic.c |    8 ++++++++
 arch/arm/mach-omap2/io.c            |    6 ++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

Tony,

Just wanted to check the status of this patch.

~sanjeev

Tony Lindgren

maintainer

2011-11-03 18:26 UTC #2 lore raw

PATCH v2 1/1 arm: omap: Fix errors and warnings when building for one board

Quoted 8 lines · Premi, Sanjeev

Quoted 8 lines
-----Original Message-----
From: Premi, Sanjeev
Sent: Thursday, October 13, 2011 9:44 PM
To: linux-omap at vger.kernel.org; linux-arm-kernel at lists.infradead.org
Cc: Premi, Sanjeev
Subject: [PATCH v2] arm: omap: Fix errors and warnings when building for one board

Quoted 5 lines

Quoted 3 lines
When customizing omap2plus_defconfig to build for only one board (omap3evm), I came across these warnings and errors (filenames truncated):
Just wanted to check the status of this patch.

Thanks, now with the DT patches merged, I'll apply this into fixes. Also moved around the ifdef a little to avoid a build warning for when omap3 is not selected.

Regards,

Tony

Daniel Mack

2011-11-03 18:45 UTC #3 lore raw

PATCH v2 1/1 arm: omap: Fix errors and warnings when building for one board

Quoted 13 lines · Tony Lindgren

Quoted 12 lines · Premi, Sanjeev
Quoted 11 lines
-----Original Message-----
From: Premi, Sanjeev
Sent: Thursday, October 13, 2011 9:44 PM
To: linux-omap at vger.kernel.org; linux-arm-kernel at lists.infradead.org
Cc: Premi, Sanjeev
Subject: [PATCH v2] arm: omap: Fix errors and warnings when building for one board
When customizing omap2plus_defconfig to build for only one board (omap3evm), I came across these warnings and errors (filenames truncated):

Quoted 5 lines

Quoted 1 line
Just wanted to check the status of this patch.
Thanks, now with the DT patches merged, I'll apply this into fixes. Also moved around the ifdef a little to avoid a build warning for when omap3 is not selected.

Great. Consider the question I posted earlier answered then :)

Daniel