Skip to contentSkip to conversation

OMAP2 build errors

PATCH New Russell King - ARM Linux 2 participants 3 messages Mar 28, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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:

arch/arm/mach-omap2/devices.c +2 -0
index d6b4b2f..d16d880 100644
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

maintainer
#1 lore raw
Quoted 22 lines · Russell King - ARM Linux

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:

arch/arm/mach-omap2/devices.c +1 -0
index d6b4b2f..d16d880 100644
@@ -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,

arch/arm/mach-omap2/devices.c static struct resource omap3_mbox_resources[] = { · line 172

Quoted 7 lines
arch/arm/mach-omap2/devices.c +1 -0
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

maintainer
#2 lore raw

PATCH 1/1 ARM: OMAP: Fix mailbox compile for 24xx (Re: OMAP2 build errors)

Quoted 29 lines · Tony Lindgren
Quoted 28 lines · Russell King - ARM Linux

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:

arch/arm/mach-omap2/devices.c +2 -0
index d6b4b2f..d16d880 100644
@@ -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
 };
 
Quoted 4 lines

arch/arm/mach-omap2/devices.c static struct resource omap3_mbox_resources[] = { · line 172

Quoted 1 line
arch/arm/mach-omap2/devices.c +0 -0
 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

Quoted 1 line

From a319737996b33cb668583b47cf38239085b7e95f Mon Sep 17 00:00:00 2001

From: Tony Lindgren <[email protected]>
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.

arch/arm/plat-omap/include/mach/omap34xx.h +1 -1
index 1b1c35d..ab64015 100644
@@ -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