[PATCH] ARM: OMAP: Fix omap1510-generic board compilation.

[PATCH] ARM: OMAP: Fix omap1510-generic board compilation.

[andrzej zaborowski]

[-- Attachment #1: Type: text/plain, Size: 146 bytes --]

Move an #endif so that it doesn't hide the mmc config declaration.
Minor formatting change.

Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>

[-- Attachment #2: 0007-ARM-OMAP-Fix-omap1510-generic-building-out-of-defconfig.txt --]
[-- Type: text/plain, Size: 1261 bytes --]

From d0ec40c4888e8d0281ae38abd5de4caba5adfc3f Mon Sep 17 00:00:00 2001
From: Andrzej Zaborowski <balrog@zabor.org>
Date: Thu, 7 Jun 2007 05:26:43 +0200
Subject: [PATCH] ARM: OMAP: Fix omap1510-generic building out of defconfig.

---
 arch/arm/mach-omap1/board-generic.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c
index 33d01ad..29fa364 100644
--- a/arch/arm/mach-omap1/board-generic.c
+++ b/arch/arm/mach-omap1/board-generic.c
@@ -55,6 +55,7 @@ static struct omap_usb_config generic1610_usb_config __initdata = {
 	.hmc_mode	= 16,
 	.pins[0]	= 6,
 };
+#endif
 
 static struct omap_mmc_config generic_mmc_config __initdata = {
 	.mmc [0] = {
@@ -73,15 +74,13 @@ static struct omap_mmc_config generic_mmc_config __initdata = {
 	},
 };
 
-#endif
-
 static struct omap_uart_config generic_uart_config __initdata = {
 	.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
 };
 
 static struct omap_board_config_kernel generic_config[] = {
-	{ OMAP_TAG_USB,           NULL },
-	{ OMAP_TAG_MMC,           &generic_mmc_config },
+	{ OMAP_TAG_USB,		NULL },
+	{ OMAP_TAG_MMC,		&generic_mmc_config },
 	{ OMAP_TAG_UART,	&generic_uart_config },
 };
 
-- 
1.4.4.3


[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] ARM: OMAP: Fix omap1510-generic board compilation.

[Tony Lindgren]

* andrzej zaborowski <balrogg@gmail.com> [070606 19:46]:
> Move an #endif so that it doesn't hide the mmc config declaration.
> Minor formatting change.
>
> Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>

> From d0ec40c4888e8d0281ae38abd5de4caba5adfc3f Mon Sep 17 00:00:00 2001
> From: Andrzej Zaborowski <balrog@zabor.org>
> Date: Thu, 7 Jun 2007 05:26:43 +0200
> Subject: [PATCH] ARM: OMAP: Fix omap1510-generic building out of defconfig.
> 
> ---
>  arch/arm/mach-omap1/board-generic.c |    7 +++----
>  1 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c
> index 33d01ad..29fa364 100644
> --- a/arch/arm/mach-omap1/board-generic.c
> +++ b/arch/arm/mach-omap1/board-generic.c
> @@ -55,6 +55,7 @@ static struct omap_usb_config generic1610_usb_config __initdata = {
>  	.hmc_mode	= 16,
>  	.pins[0]	= 6,
>  };
> +#endif
>  
>  static struct omap_mmc_config generic_mmc_config __initdata = {
>  	.mmc [0] = {
> @@ -73,15 +74,13 @@ static struct omap_mmc_config generic_mmc_config __initdata = {
>  	},
>  };
>  
> -#endif
> -
>  static struct omap_uart_config generic_uart_config __initdata = {
>  	.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
>  };
>  
>  static struct omap_board_config_kernel generic_config[] = {
> -	{ OMAP_TAG_USB,           NULL },
> -	{ OMAP_TAG_MMC,           &generic_mmc_config },
> +	{ OMAP_TAG_USB,		NULL },
> +	{ OMAP_TAG_MMC,		&generic_mmc_config },
>  	{ OMAP_TAG_UART,	&generic_uart_config },
>  };
>  

This one does not seem to apply, did you forget to send your patch
0006 that this depends on?

Tony

Re: [PATCH] ARM: OMAP: Fix omap1510-generic board compilation.

[andrzej zaborowski]

[-- Attachment #1: Type: text/plain, Size: 671 bytes --]

On 08/06/07, Tony Lindgren <tony@atomide.com> wrote:
> * andrzej zaborowski <balrogg@gmail.com> [070606 19:46]:
> > Move an #endif so that it doesn't hide the mmc config declaration.
> > Minor formatting change.
> >
> > Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>
>
[...]
> This one does not seem to apply, did you forget to send your patch
> 0006 that this depends on?

Sorry, forgot to update my tree before diffing. Attached is a version
that applies. Sorry for the noise.

0006 was the collective defconfig update which doesn't seem to have
made it to everyone's mailboxes because it was 200+ KB. Will resend
the update separated per board.

Cheers,
Andrzej

[-- Attachment #2: 0015-ARM-OMAP-Fix-omap1510-generic-board-compilation.txt --]
[-- Type: text/plain, Size: 1356 bytes --]

From 5a51d9d3480d9d6b1efe4e6dbf9c1efc75d75cad Mon Sep 17 00:00:00 2001
From: Andrzej Zaborowski <balrog@zabor.org>
Date: Sun, 10 Jun 2007 14:36:34 +0200
Subject: [PATCH] ARM: OMAP: Fix omap1510-generic board compilation

Move an #endif so that it doesn't hide the mmc config declaration.
Minor formatting change.
---
 arch/arm/mach-omap1/board-generic.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c
index 228fd00..4b35f16 100644
--- a/arch/arm/mach-omap1/board-generic.c
+++ b/arch/arm/mach-omap1/board-generic.c
@@ -55,6 +55,7 @@ static struct omap_usb_config generic1610_usb_config __initdata = {
 	.hmc_mode	= 16,
 	.pins[0]	= 6,
 };
+#endif
 
 static struct omap_mmc_config generic_mmc_config __initdata = {
 	.mmc [0] = {
@@ -73,15 +74,13 @@ static struct omap_mmc_config generic_mmc_config __initdata = {
 	},
 };
 
-#endif
-
 static struct omap_uart_config generic_uart_config __initdata = {
 	.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
 };
 
 static struct omap_board_config_kernel generic_config[] __initdata = {
-	{ OMAP_TAG_USB,           NULL },
-	{ OMAP_TAG_MMC,           &generic_mmc_config },
+	{ OMAP_TAG_USB,		NULL },
+	{ OMAP_TAG_MMC,		&generic_mmc_config },
 	{ OMAP_TAG_UART,	&generic_uart_config },
 };
 
-- 
1.4.4.3


[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] ARM: OMAP: Fix omap1510-generic board compilation.

[Tony Lindgren]

* andrzej zaborowski <balrogg@gmail.com> [070610 04:53]:
> On 08/06/07, Tony Lindgren <tony@atomide.com> wrote:
>> * andrzej zaborowski <balrogg@gmail.com> [070606 19:46]:
>> > Move an #endif so that it doesn't hide the mmc config declaration.
>> > Minor formatting change.
>> >
>> > Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>
>>
> [...]
>> This one does not seem to apply, did you forget to send your patch
>> 0006 that this depends on?
>
> Sorry, forgot to update my tree before diffing. Attached is a version
> that applies. Sorry for the noise.

:)

> 0006 was the collective defconfig update which doesn't seem to have
> made it to everyone's mailboxes because it was 200+ KB. Will resend
> the update separated per board.

Thanks, pushing today.

Tony