* [RFC/PATCH] ARM: OMAP: Fix build for OMAP3 only builds
@ 2011-10-12 12:03 Thomas Weber
2011-10-27 5:32 ` Nori, Sekhar
0 siblings, 1 reply; 9+ messages in thread
From: Thomas Weber @ 2011-10-12 12:03 UTC (permalink / raw)
To: linux-omap; +Cc: Thomas Weber, Tony Lindgren, Russell King
When building for OMAP3 only I get the
following errors:
In function `omap2420_init_early':
undefined reference to `omap2_set_globals_242x'
undefined reference to `omap2xxx_voltagedomains_init'
undefined reference to `omap242x_powerdomains_init'
undefined reference to `omap242x_clockdomains_init'
undefined reference to `omap2420_hwmod_init'
In function `omap2430_init_early':
undefined reference to `omap2_set_globals_243x'
undefined reference to `omap2xxx_voltagedomains_init'
undefined reference to `omap243x_powerdomains_init'
undefined reference to `omap243x_clockdomains_init'
undefined reference to `omap2430_hwmod_init'
In function `omap4430_init_early':
undefined reference to `omap2_set_globals_443x'
undefined reference to `omap44xx_voltagedomains_init'
undefined reference to `omap44xx_powerdomains_init'
undefined reference to `omap44xx_clockdomains_init'
undefined reference to `omap44xx_hwmod_init'
undefined reference to `omap4xxx_clk_init'
With this patch the omapXXXX_init_early will be compiled only
when their SOC's are selected.
Signed-off-by: Thomas Weber <weber@corscience.de>
---
arch/arm/mach-omap2/io.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index aa96538..f8b9cfa 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -359,6 +359,7 @@ static void __init omap_hwmod_init_postsetup(void)
omap_pm_if_early_init();
}
+#ifdef CONFIG_SOC_OMAP2420
void __init omap2420_init_early(void)
{
omap2_set_globals_242x();
@@ -370,7 +371,9 @@ void __init omap2420_init_early(void)
omap_hwmod_init_postsetup();
omap2420_clk_init();
}
+#endif
+#ifdef CONFIG_SOC_OMAP2430
void __init omap2430_init_early(void)
{
omap2_set_globals_243x();
@@ -382,7 +385,9 @@ void __init omap2430_init_early(void)
omap_hwmod_init_postsetup();
omap2430_clk_init();
}
+#endif
+#ifdef CONFIG_ARCH_OMAP3
/*
* Currently only board-omap3beagle.c should call this because of the
* same machine_id for 34xx and 36xx beagle.. Will get fixed with DT.
@@ -430,7 +435,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 +449,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)
--
1.7.7
^ permalink raw reply related [flat|nested] 9+ messages in thread
* RE: [RFC/PATCH] ARM: OMAP: Fix build for OMAP3 only builds
2011-10-12 12:03 [RFC/PATCH] ARM: OMAP: Fix build for OMAP3 only builds Thomas Weber
@ 2011-10-27 5:32 ` Nori, Sekhar
2011-11-02 12:37 ` Thomas Weber
0 siblings, 1 reply; 9+ messages in thread
From: Nori, Sekhar @ 2011-10-27 5:32 UTC (permalink / raw)
To: Thomas Weber, linux-omap@vger.kernel.org; +Cc: Tony Lindgren, Russell King
On Wed, Oct 12, 2011 at 17:33:56, Thomas Weber wrote:
> When building for OMAP3 only I get the
> following errors:
>
> In function `omap2420_init_early':
> undefined reference to `omap2_set_globals_242x'
> undefined reference to `omap2xxx_voltagedomains_init'
> undefined reference to `omap242x_powerdomains_init'
> undefined reference to `omap242x_clockdomains_init'
> undefined reference to `omap2420_hwmod_init'
>
> In function `omap2430_init_early':
> undefined reference to `omap2_set_globals_243x'
> undefined reference to `omap2xxx_voltagedomains_init'
> undefined reference to `omap243x_powerdomains_init'
> undefined reference to `omap243x_clockdomains_init'
> undefined reference to `omap2430_hwmod_init'
>
> In function `omap4430_init_early':
> undefined reference to `omap2_set_globals_443x'
> undefined reference to `omap44xx_voltagedomains_init'
> undefined reference to `omap44xx_powerdomains_init'
> undefined reference to `omap44xx_clockdomains_init'
> undefined reference to `omap44xx_hwmod_init'
> undefined reference to `omap4xxx_clk_init'
>
> With this patch the omapXXXX_init_early will be compiled only
> when their SOC's are selected.
>
> Signed-off-by: Thomas Weber <weber@corscience.de>
I was facing the same problem and this patch helped
me get rid of it.
Tested-by: Sekhar Nori <nsekhar@ti.com>
Thanks,
Sekhar
^ permalink raw reply [flat|nested] 9+ messages in thread
* RE: [RFC/PATCH] ARM: OMAP: Fix build for OMAP3 only builds
@ 2011-10-29 4:42 Thomas Weber
0 siblings, 0 replies; 9+ messages in thread
From: Thomas Weber @ 2011-10-29 4:42 UTC (permalink / raw)
To: Nori, Sekhar, Thomas Weber, linux-omap@vger.kernel.org
Cc: Tony Lindgren, Russell King
Thank you Sekhar,
Can you please test the following patch
[PATCH v2] arm: omap: Fix errors and warnings when building for one board
Thomas
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [RFC/PATCH] ARM: OMAP: Fix build for OMAP3 only builds
2011-10-27 5:32 ` Nori, Sekhar
@ 2011-11-02 12:37 ` Thomas Weber
2011-11-02 17:16 ` Tony Lindgren
0 siblings, 1 reply; 9+ messages in thread
From: Thomas Weber @ 2011-11-02 12:37 UTC (permalink / raw)
To: Nori, Sekhar
Cc: Thomas Weber, linux-omap@vger.kernel.org, Tony Lindgren,
Russell King
Am 27.10.2011 07:32, schrieb Nori, Sekhar:
> On Wed, Oct 12, 2011 at 17:33:56, Thomas Weber wrote:
>> When building for OMAP3 only I get the
>> following errors:
>>
>> In function `omap2420_init_early':
>> undefined reference to `omap2_set_globals_242x'
>> undefined reference to `omap2xxx_voltagedomains_init'
>> undefined reference to `omap242x_powerdomains_init'
>> undefined reference to `omap242x_clockdomains_init'
>> undefined reference to `omap2420_hwmod_init'
>>
>> In function `omap2430_init_early':
>> undefined reference to `omap2_set_globals_243x'
>> undefined reference to `omap2xxx_voltagedomains_init'
>> undefined reference to `omap243x_powerdomains_init'
>> undefined reference to `omap243x_clockdomains_init'
>> undefined reference to `omap2430_hwmod_init'
>>
>> In function `omap4430_init_early':
>> undefined reference to `omap2_set_globals_443x'
>> undefined reference to `omap44xx_voltagedomains_init'
>> undefined reference to `omap44xx_powerdomains_init'
>> undefined reference to `omap44xx_clockdomains_init'
>> undefined reference to `omap44xx_hwmod_init'
>> undefined reference to `omap4xxx_clk_init'
>>
>> With this patch the omapXXXX_init_early will be compiled only
>> when their SOC's are selected.
>>
>> Signed-off-by: Thomas Weber <weber@corscience.de>
>
> I was facing the same problem and this patch helped
> me get rid of it.
>
> Tested-by: Sekhar Nori <nsekhar@ti.com>
>
> Thanks,
> Sekhar
>
> --
Hello Tony,
what is the status of this patch?
There is also another patch fixing the same problem.
[PATCH v2] arm: omap: Fix errors and warnings when building for one board
Thomas
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [RFC/PATCH] ARM: OMAP: Fix build for OMAP3 only builds
2011-11-02 12:37 ` Thomas Weber
@ 2011-11-02 17:16 ` Tony Lindgren
2011-11-03 18:30 ` Tony Lindgren
0 siblings, 1 reply; 9+ messages in thread
From: Tony Lindgren @ 2011-11-02 17:16 UTC (permalink / raw)
To: Thomas Weber
Cc: Nori, Sekhar, Thomas Weber, linux-omap@vger.kernel.org,
Russell King
* Thomas Weber <thomas.weber.linux@googlemail.com> [111102 04:03]:
> Am 27.10.2011 07:32, schrieb Nori, Sekhar:
> > On Wed, Oct 12, 2011 at 17:33:56, Thomas Weber wrote:
> >> When building for OMAP3 only I get the
> >> following errors:
> >>
> >> In function `omap2420_init_early':
> >> undefined reference to `omap2_set_globals_242x'
> >> undefined reference to `omap2xxx_voltagedomains_init'
> >> undefined reference to `omap242x_powerdomains_init'
> >> undefined reference to `omap242x_clockdomains_init'
> >> undefined reference to `omap2420_hwmod_init'
> >>
> >> In function `omap2430_init_early':
> >> undefined reference to `omap2_set_globals_243x'
> >> undefined reference to `omap2xxx_voltagedomains_init'
> >> undefined reference to `omap243x_powerdomains_init'
> >> undefined reference to `omap243x_clockdomains_init'
> >> undefined reference to `omap2430_hwmod_init'
> >>
> >> In function `omap4430_init_early':
> >> undefined reference to `omap2_set_globals_443x'
> >> undefined reference to `omap44xx_voltagedomains_init'
> >> undefined reference to `omap44xx_powerdomains_init'
> >> undefined reference to `omap44xx_clockdomains_init'
> >> undefined reference to `omap44xx_hwmod_init'
> >> undefined reference to `omap4xxx_clk_init'
> >>
> >> With this patch the omapXXXX_init_early will be compiled only
> >> when their SOC's are selected.
> >>
> >> Signed-off-by: Thomas Weber <weber@corscience.de>
> >
> > I was facing the same problem and this patch helped
> > me get rid of it.
> >
> > Tested-by: Sekhar Nori <nsekhar@ti.com>
> >
> > Thanks,
> > Sekhar
> >
> > --
>
> Hello Tony,
>
> what is the status of this patch?
>
> There is also another patch fixing the same problem.
>
> [PATCH v2] arm: omap: Fix errors and warnings when building for one board
Well looks like we got the initial DT changes merged! Only two
minor patches needed for compile errors that I just posted.
Will take a look at this and other fixes needed to fixes-part2
next.
Tony
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [RFC/PATCH] ARM: OMAP: Fix build for OMAP3 only builds
2011-11-02 17:16 ` Tony Lindgren
@ 2011-11-03 18:30 ` Tony Lindgren
2011-11-03 21:24 ` Thomas Weber
2011-11-07 17:06 ` Russell King - ARM Linux
0 siblings, 2 replies; 9+ messages in thread
From: Tony Lindgren @ 2011-11-03 18:30 UTC (permalink / raw)
To: Thomas Weber
Cc: Nori, Sekhar, Thomas Weber, linux-omap@vger.kernel.org,
Russell King
* Tony Lindgren <tony@atomide.com> [111102 09:41]:
> * Thomas Weber <thomas.weber.linux@googlemail.com> [111102 04:03]:
> > Am 27.10.2011 07:32, schrieb Nori, Sekhar:
> > > On Wed, Oct 12, 2011 at 17:33:56, Thomas Weber wrote:
> > >> When building for OMAP3 only I get the
> > >> following errors:
...
> > > I was facing the same problem and this patch helped
> > > me get rid of it.
> > >
> > > Tested-by: Sekhar Nori <nsekhar@ti.com>
> >
> > Hello Tony,
> >
> > what is the status of this patch?
> >
> > There is also another patch fixing the same problem.
> >
> > [PATCH v2] arm: omap: Fix errors and warnings when building for one board
>
> Well looks like we got the initial DT changes merged! Only two
> minor patches needed for compile errors that I just posted.
>
> Will take a look at this and other fixes needed to fixes-part2
> next.
Considering we now have the DT branch merged, I'll apply the earlier
patch from Sanjeev with a minor modification to avoid a build
warning in board-generic.c.
Updated patch below, Sekhar & Thomas, care to ack?
Regards,
Tony
From: Sanjeev Premi <premi@ti.com>
Date: Thu, 13 Oct 2011 21:44:10 +0530
Subject: [PATCH] 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 <premi@ti.com>
[tony@atomide.com: updated to fix warnings for board-generic.c]
Signed-off-by: Tony Lindgren <tony@atomide.com>
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -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 = {
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -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)
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [RFC/PATCH] ARM: OMAP: Fix build for OMAP3 only builds
2011-11-03 18:30 ` Tony Lindgren
@ 2011-11-03 21:24 ` Thomas Weber
2011-11-07 17:06 ` Russell King - ARM Linux
1 sibling, 0 replies; 9+ messages in thread
From: Thomas Weber @ 2011-11-03 21:24 UTC (permalink / raw)
To: Tony Lindgren
Cc: Thomas Weber, Nori, Sekhar, Thomas Weber,
linux-omap@vger.kernel.org, Russell King
Am 03.11.2011 19:30, schrieb Tony Lindgren:
> * Tony Lindgren <tony@atomide.com> [111102 09:41]:
>> * Thomas Weber <thomas.weber.linux@googlemail.com> [111102 04:03]:
>>> Am 27.10.2011 07:32, schrieb Nori, Sekhar:
>>>> On Wed, Oct 12, 2011 at 17:33:56, Thomas Weber wrote:
>>>>> When building for OMAP3 only I get the
>>>>> following errors:
> ...
>
>>>> I was facing the same problem and this patch helped
>>>> me get rid of it.
>>>>
>>>> Tested-by: Sekhar Nori <nsekhar@ti.com>
>>> Hello Tony,
>>>
>>> what is the status of this patch?
>>>
>>> There is also another patch fixing the same problem.
>>>
>>> [PATCH v2] arm: omap: Fix errors and warnings when building for one board
>> Well looks like we got the initial DT changes merged! Only two
>> minor patches needed for compile errors that I just posted.
>>
>> Will take a look at this and other fixes needed to fixes-part2
>> next.
> Considering we now have the DT branch merged, I'll apply the earlier
> patch from Sanjeev with a minor modification to avoid a build
> warning in board-generic.c.
>
> Updated patch below, Sekhar & Thomas, care to ack?
>
> Regards,
>
> Tony
>
>
> From: Sanjeev Premi <premi@ti.com>
> Date: Thu, 13 Oct 2011 21:44:10 +0530
> Subject: [PATCH] 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 <premi@ti.com>
> [tony@atomide.com: updated to fix warnings for board-generic.c]
> Signed-off-by: Tony Lindgren <tony@atomide.com>
>
> --- a/arch/arm/mach-omap2/board-generic.c
> +++ b/arch/arm/mach-omap2/board-generic.c
> @@ -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 = {
> --- a/arch/arm/mach-omap2/io.c
> +++ b/arch/arm/mach-omap2/io.c
> @@ -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)
Acked-by: Thomas Weber <weber@corscience.de>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [RFC/PATCH] ARM: OMAP: Fix build for OMAP3 only builds
2011-11-03 18:30 ` Tony Lindgren
2011-11-03 21:24 ` Thomas Weber
@ 2011-11-07 17:06 ` Russell King - ARM Linux
2011-11-07 17:29 ` Tony Lindgren
1 sibling, 1 reply; 9+ messages in thread
From: Russell King - ARM Linux @ 2011-11-07 17:06 UTC (permalink / raw)
To: Tony Lindgren
Cc: Thomas Weber, Nori, Sekhar, Thomas Weber,
linux-omap@vger.kernel.org
On Thu, Nov 03, 2011 at 11:30:02AM -0700, Tony Lindgren wrote:
> Considering we now have the DT branch merged, I'll apply the earlier
> patch from Sanjeev with a minor modification to avoid a build
> warning in board-generic.c.
>
> Updated patch below, Sekhar & Thomas, care to ack?
When are we likely to see this patch in mainline given that my OMAP
builds are yet again broken during the merge window?
(You can *and should* send fixes for regressions during the merge window.
If you want to batch them up and send them towards the end of the merge
window, that's a good idea too. But to have a broken -rc1 is bad
practice.)
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [RFC/PATCH] ARM: OMAP: Fix build for OMAP3 only builds
2011-11-07 17:06 ` Russell King - ARM Linux
@ 2011-11-07 17:29 ` Tony Lindgren
0 siblings, 0 replies; 9+ messages in thread
From: Tony Lindgren @ 2011-11-07 17:29 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: Thomas Weber, Nori, Sekhar, Thomas Weber,
linux-omap@vger.kernel.org
* Russell King - ARM Linux <linux@arm.linux.org.uk> [111107 08:31]:
> On Thu, Nov 03, 2011 at 11:30:02AM -0700, Tony Lindgren wrote:
> > Considering we now have the DT branch merged, I'll apply the earlier
> > patch from Sanjeev with a minor modification to avoid a build
> > warning in board-generic.c.
> >
> > Updated patch below, Sekhar & Thomas, care to ack?
>
> When are we likely to see this patch in mainline given that my OMAP
> builds are yet again broken during the merge window?
This is queud in fixes branch now.
> (You can *and should* send fixes for regressions during the merge window.
> If you want to batch them up and send them towards the end of the merge
> window, that's a good idea too. But to have a broken -rc1 is bad
> practice.)
Right, sorry for the delays. I think I have all the pending fixes
now queued finally.
Regards,
Tony
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2011-11-07 17:29 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-12 12:03 [RFC/PATCH] ARM: OMAP: Fix build for OMAP3 only builds Thomas Weber
2011-10-27 5:32 ` Nori, Sekhar
2011-11-02 12:37 ` Thomas Weber
2011-11-02 17:16 ` Tony Lindgren
2011-11-03 18:30 ` Tony Lindgren
2011-11-03 21:24 ` Thomas Weber
2011-11-07 17:06 ` Russell King - ARM Linux
2011-11-07 17:29 ` Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2011-10-29 4:42 Thomas Weber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox