[PATCH 1/2] ar7: fix build failures when CONFIG_SERIAL_8250 is not enabled

[PATCH 1/2] ar7: fix build failures when CONFIG_SERIAL_8250 is not enabled

[Florian Fainelli]

This patch fixes the following build failure when CONFIG_SERIAL_8250
is not enabled in the kernel configuration:
arch/mips/ar7/built-in.o: In function `ar7_register_devices':
platform.c:(.init.text+0x61c): undefined reference to `early_serial_setup'
platform.c:(.init.text+0x61c): relocation truncated to fit: R_MIPS_26 against `early_serial_setup'
platform.c:(.init.text+0x68c): undefined reference to `early_serial_setup'
platform.c:(.init.text+0x68c): relocation truncated to fit: R_MIPS_26 against `early_serial_setup'

Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
index cbe4fa4..d0624d8 100644
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
@@ -494,8 +494,9 @@ static void __init detect_leds(void)
 static int __init ar7_register_devices(void)
 {
 	int res;
-	static struct uart_port uart_port[2];
 	u16 chip_id;
+#ifdef CONFIG_SERIAL_8250
+	static struct uart_port uart_port[2];
 
 	memset(uart_port, 0, sizeof(struct uart_port) * 2);
 
@@ -526,7 +527,7 @@ static int __init ar7_register_devices(void)
 		if (res)
 			return res;
 	}
-
+#endif /* CONFIG_SERIAL_8250 */
 	res = platform_device_register(&physmap_flash);
 	if (res)
 		return res;

Re: [PATCH 1/2] ar7: fix build failures when CONFIG_SERIAL_8250 is not enabled

[Ralf Baechle]

On Tue, Jul 21, 2009 at 12:37:37PM +0200, Florian Fainelli wrote:

> This patch fixes the following build failure when CONFIG_SERIAL_8250
> is not enabled in the kernel configuration:
> arch/mips/ar7/built-in.o: In function `ar7_register_devices':
> platform.c:(.init.text+0x61c): undefined reference to `early_serial_setup'
> platform.c:(.init.text+0x61c): relocation truncated to fit: R_MIPS_26 against `early_serial_setup'
> platform.c:(.init.text+0x68c): undefined reference to `early_serial_setup'
> platform.c:(.init.text+0x68c): relocation truncated to fit: R_MIPS_26 against `early_serial_setup'

This patch rejects.

  Ralf

Re: [PATCH 1/2] ar7: fix build failures when CONFIG_SERIAL_8250 is not enabled

[Florian Fainelli]

Le Tuesday 21 July 2009 17:08:12 Ralf Baechle, vous avez écrit :
> On Tue, Jul 21, 2009 at 12:37:37PM +0200, Florian Fainelli wrote:
> > This patch fixes the following build failure when CONFIG_SERIAL_8250
> > is not enabled in the kernel configuration:
> > arch/mips/ar7/built-in.o: In function `ar7_register_devices':
> > platform.c:(.init.text+0x61c): undefined reference to
> > `early_serial_setup' platform.c:(.init.text+0x61c): relocation truncated
> > to fit: R_MIPS_26 against `early_serial_setup'
> > platform.c:(.init.text+0x68c): undefined reference to
> > `early_serial_setup' platform.c:(.init.text+0x68c): relocation truncated
> > to fit: R_MIPS_26 against `early_serial_setup'
>
> This patch rejects.

The one I sent previously applies to -queue, the one below applies to -master. Thanks !
--
From: Florian Fainelli <florian@openwrt.org>
Subject: [PATCH] ar7: fix build failures when CONFIG_SERIAL_8250 is not enabled

This patch fixes the following build failure when CONFIG_SERIAL_8250
is not enabled in the kernel configuration:
arch/mips/ar7/built-in.o: In function `ar7_register_devices':
platform.c:(.init.text+0x61c): undefined reference to `early_serial_setup'
platform.c:(.init.text+0x61c): relocation truncated to fit: R_MIPS_26 against `early_serial_setup'
platform.c:(.init.text+0x68c): undefined reference to `early_serial_setup'
platform.c:(.init.text+0x68c): relocation truncated to fit: R_MIPS_26 against `early_serial_setup'

Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
index c4d71fb..8ef8266 100644
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
@@ -480,6 +480,7 @@ static void __init detect_leds(void)
 static int __init ar7_register_devices(void)
 {
 	int res;
+#ifdef CONFIG_SERIAL_8250
 	static struct uart_port uart_port[2];
 
 	memset(uart_port, 0, sizeof(struct uart_port) * 2);
@@ -511,7 +512,7 @@ static int __init ar7_register_devices(void)
 		if (res)
 			return res;
 	}
-
+#endif /* CONFIG_SERIAL_8250 */
 	res = platform_device_register(&physmap_flash);
 	if (res)
 		return res;

Re: [PATCH 1/2] ar7: fix build failures when CONFIG_SERIAL_8250 is not enabled

[Ralf Baechle]

On Fri, Jul 24, 2009 at 01:24:15PM +0200, Florian Fainelli wrote:

> > This patch rejects.
> 
> The one I sent previously applies to -queue, the one below applies to -master. Thanks !

Well, you want 2.6.30 to work, no?

Applied.  Thanks!

  Ralf