* OMAP2 build errors
@ 2009-03-28 12:48 Russell King - ARM Linux
2009-03-28 17:35 ` Tony Lindgren
0 siblings, 1 reply; 3+ messages in thread
From: Russell King - ARM Linux @ 2009-03-28 12:48 UTC (permalink / raw)
To: linux-arm-kernel, linux-omap, Tony Lindgren
The result of building an OMAP2 configuration for merged mainline, master
and devel branches is:
CC arch/arm/mach-omap2/devices.o
arch/arm/mach-omap2/devices.c:160: error: ■OMAP34XX_MAILBOX_BASE■ undeclared here (not in a function)
Please resolve ASAP - if I don't have a patch by this evening, I will
commit the work-around below:
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index d6b4b2f..d16d880 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -156,6 +156,7 @@ static struct resource omap2_mbox_resources[] = {
};
static struct resource omap3_mbox_resources[] = {
+#ifdef CONFIG_ARCH_OMAP3
{
.start = OMAP34XX_MAILBOX_BASE,
.end = OMAP34XX_MAILBOX_BASE + MBOX_REG_SIZE - 1,
@@ -165,6 +166,7 @@ static struct resource omap3_mbox_resources[] = {
.start = INT_24XX_MAIL_U0_MPU,
.flags = IORESOURCE_IRQ,
},
+#endif
};
static struct platform_device mbox_device = {
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: OMAP2 build errors
2009-03-28 12:48 OMAP2 build errors Russell King - ARM Linux
@ 2009-03-28 17:35 ` Tony Lindgren
2009-03-28 17:57 ` [PATCH] ARM: OMAP: Fix mailbox compile for 24xx (Re: OMAP2 build errors) Tony Lindgren
0 siblings, 1 reply; 3+ messages in thread
From: Tony Lindgren @ 2009-03-28 17:35 UTC (permalink / raw)
To: Russell King - ARM Linux; +Cc: linux-arm-kernel, linux-omap
* Russell King - ARM Linux <linux@arm.linux.org.uk> [090328 05:48]:
> The result of building an OMAP2 configuration for merged mainline, master
> and devel branches is:
>
> CC arch/arm/mach-omap2/devices.o
> arch/arm/mach-omap2/devices.c:160: error: ■OMAP34XX_MAILBOX_BASE■ undeclared here (not in a function)
>
> Please resolve ASAP - if I don't have a patch by this evening, I will
> commit the work-around below:
>
> diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
> index d6b4b2f..d16d880 100644
> --- a/arch/arm/mach-omap2/devices.c
> +++ b/arch/arm/mach-omap2/devices.c
> @@ -156,6 +156,7 @@ static struct resource omap2_mbox_resources[] = {
> };
>
> static struct resource omap3_mbox_resources[] = {
> +#ifdef CONFIG_ARCH_OMAP3
> {
> .start = OMAP34XX_MAILBOX_BASE,
> .end = OMAP34XX_MAILBOX_BASE + MBOX_REG_SIZE - 1,
> @@ -165,6 +166,7 @@ static struct resource omap3_mbox_resources[] = {
> .start = INT_24XX_MAIL_U0_MPU,
> .flags = IORESOURCE_IRQ,
> },
> +#endif
> };
>
> static struct platform_device mbox_device = {
Hmm, I thought I compiled all boards both against mainline and
omap-clks3. I'll check it and send a patch ASAP.
Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] ARM: OMAP: Fix mailbox compile for 24xx (Re: OMAP2 build errors)
2009-03-28 17:35 ` Tony Lindgren
@ 2009-03-28 17:57 ` Tony Lindgren
0 siblings, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2009-03-28 17:57 UTC (permalink / raw)
To: Russell King - ARM Linux; +Cc: linux-arm-kernel, linux-omap
[-- Attachment #1: Type: text/plain, Size: 1672 bytes --]
* Tony Lindgren <tony@atomide.com> [090328 10:36]:
> * Russell King - ARM Linux <linux@arm.linux.org.uk> [090328 05:48]:
> > The result of building an OMAP2 configuration for merged mainline, master
> > and devel branches is:
> >
> > CC arch/arm/mach-omap2/devices.o
> > arch/arm/mach-omap2/devices.c:160: error: ■OMAP34XX_MAILBOX_BASE■ undeclared here (not in a function)
> >
> > Please resolve ASAP - if I don't have a patch by this evening, I will
> > commit the work-around below:
> >
> > diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
> > index d6b4b2f..d16d880 100644
> > --- a/arch/arm/mach-omap2/devices.c
> > +++ b/arch/arm/mach-omap2/devices.c
> > @@ -156,6 +156,7 @@ static struct resource omap2_mbox_resources[] = {
> > };
> >
> > static struct resource omap3_mbox_resources[] = {
> > +#ifdef CONFIG_ARCH_OMAP3
> > {
> > .start = OMAP34XX_MAILBOX_BASE,
> > .end = OMAP34XX_MAILBOX_BASE + MBOX_REG_SIZE - 1,
> > @@ -165,6 +166,7 @@ static struct resource omap3_mbox_resources[] = {
> > .start = INT_24XX_MAIL_U0_MPU,
> > .flags = IORESOURCE_IRQ,
> > },
> > +#endif
> > };
> >
> > static struct platform_device mbox_device = {
>
> Hmm, I thought I compiled all boards both against mainline and
> omap-clks3. I'll check it and send a patch ASAP.
But did not seem to have CONFIG_OMAP_MBOX_FWK set in my 24xx configs.
Here's the fix, also in your patch system as 5434/1.
I'll also continue the header clean-up for the next merge window to get
rid of the ifdefs in the processor header files to fix things like
OMAP2_32KSYNCT_BASE, OMAP2_CM_BASE, OMAP2_PRM_BASE and OMAP2_VA_IC_BASE.
Tony
[-- Attachment #2: mbox-compile.patch --]
[-- Type: text/x-diff, Size: 1007 bytes --]
>From a319737996b33cb668583b47cf38239085b7e95f Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Sat, 28 Mar 2009 10:50:05 -0700
Subject: [PATCH] ARM: OMAP: Fix mailbox compile for 24xx
OMAP34XX_MAILBOX_BASE must be defined both for 24xx and 34xx.
Signed-off-by: Tony Lindgren <tony@atomide.com>
diff --git a/arch/arm/plat-omap/include/mach/omap34xx.h b/arch/arm/plat-omap/include/mach/omap34xx.h
index 1b1c35d..ab64015 100644
--- a/arch/arm/plat-omap/include/mach/omap34xx.h
+++ b/arch/arm/plat-omap/include/mach/omap34xx.h
@@ -81,6 +81,7 @@
#define OMAP34XX_HSUSB_HOST_BASE (L4_34XX_BASE + 0x64000)
#define OMAP34XX_USBTLL_BASE (L4_34XX_BASE + 0x62000)
+#define OMAP34XX_MAILBOX_BASE (L4_34XX_BASE + 0x94000)
#if defined(CONFIG_ARCH_OMAP3430)
@@ -88,7 +89,6 @@
#define OMAP2_CM_BASE OMAP3430_CM_BASE
#define OMAP2_PRM_BASE OMAP3430_PRM_BASE
#define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP34XX_IC_BASE)
-#define OMAP34XX_MAILBOX_BASE (L4_34XX_BASE + 0x94000)
#endif
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-03-28 17:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-28 12:48 OMAP2 build errors Russell King - ARM Linux
2009-03-28 17:35 ` Tony Lindgren
2009-03-28 17:57 ` [PATCH] ARM: OMAP: Fix mailbox compile for 24xx (Re: OMAP2 build errors) Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).