ar7: fix build failures when CONFIG_SERIAL_8250 is not enabled

PATCH Applied Florian Fainelli 2 participants 4 messages Jul 21, 2009 – Jul 29, 2009 MIPS

Share & tools

Florian Fainelli

author

2009-07-21 10:37 UTC #0 lore raw

PATCH 1/2 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 <[email protected]>

---

arch/mips/ar7/platform.c +3 -2

index cbe4fa4..d0624d8 100644
@@ -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;

Ralf Baechle

2009-07-21 15:08 UTC #1 lore raw

Quoted 7 lines · 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'

This patch rejects.

Ralf

Florian Fainelli

author

2009-07-24 11:24 UTC #2 lore raw

Le Tuesday 21 July 2009 17:08:12 Ralf Baechle, vous avez écrit :

Quoted 11 lines · Florian Fainelli

Quoted 9 lines
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'

Quoted 1 line

This patch rejects.

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

Signed-off-by Florian Fainelli <[email protected]>

---

arch/mips/ar7/platform.c +2 -1

index c4d71fb..8ef8266 100644
@@ -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;

Ralf Baechle

Applied

2009-07-29 21:46 UTC #3 lore raw

Quoted 3 lines · Florian Fainelli

Quoted 1 line
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