ARM: OMAP: Fix errors and warnings when building for one board (c4e2d245) · Commits · 戴 / test

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 <premi@ti.com> Acked-by:

Thomas Weber <weber@corscience.de> [tony@atomide.com: updated to fix warnings for board-generic.c] Signed-off-by:

Tony Lindgren <tony@atomide.com>

arch/arm/mach-omap2/board-generic.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,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,
		@@ -37,7 +38,9 @@ static void __init omap4_i2c_init(void)
		{
		omap4_pmic_init("twl6030", &sdp4430_twldata);
		}
		#endif

		#ifdef CONFIG_ARCH_OMAP3
		static struct twl4030_platform_data beagle_twldata = {
		.irq_base = TWL4030_IRQ_BASE,
		.irq_end = TWL4030_IRQ_END,
		@@ -47,6 +50,7 @@ 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", },
		@@ -72,17 +76,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

Original line number	Diff line number	Diff line
		@@ -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)

Admin message