ppchameleon_early_serial_map hidden under #ifdef CONFIG_SERIAL_8250
PATCH 1/1 ppchameleon_early_serial_map hidden under #ifdef CONFIG_SERIAL_8250
Hello List!
Having selected PPChameleonEVB as a platform and having turned off seral driver (CONFIG_SERIAL_8250 is not set) I got the following error message during kernel compilation:
arch/ppc/platforms/4xx/built-in.o: In function `board_setup_arch':
: undefined reference to `early_serial_setup'
Perhaps the following patch will be ok?
Date: Tue, 3 Apr 2007 09:11:35 +0400
Subject: [PATCH] ppchameleon_early_serial_map hidden under #ifdef CONFIG_SERIAL_8250
--- arch/ppc/platforms/4xx/ppchameleon.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
arch/ppc/platforms/4xx/ppchameleon.c +6 -1
@@ -45,7 +45,9 @@void *ppchameleon_rtc_base;extern void gen550_init (int ,struct uart_port *); +#ifdef CONFIG_SERIAL_8250 extern int early_serial_setup (struct uart_port *port); +#endif /* CONFIG_SERIAL_8250 */ /* Some IRQs unique to the board * Used by the generic 405 PCI setup functions in ppc4xx_pci.c
@@ -75,6 +77,7 @@ ppc405_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)* Calculate the proper input baud rate and setup the serial driver. */ +#ifdef CONFIG_SERIAL_8250 static void __init ppchameleon_early_serial_map (void ) {
@@ -105,7 +108,9 @@ ppchameleon_early_serial_map (void) printk ("Early serial init of port 0 failed\n"); } } - +#else /* CONFIG_SERIAL_8250 */ +#define ppchameleon_early_serial_map () +#endif /* CONFIG_SERIAL_8250 */ void __init board_setup_arch (void ) {
Signature · 3 lines
Best regards, Igor Marnat mailto:[email protected]
Quoted 11 lines · Igor Marnat
Hello List!
Having selected PPChameleonEVB as a platform and having turned off seral driver (
CONFIG_SERIAL_8250is not set) I got the following error message during kernel compilation:
arch/ppc/platforms/4xx/built-in.o: In function `board_setup_arch':
: undefined reference to `early_serial_setup'Perhaps the following patch will be ok?
In general looks okay, but one comment below. This code is going to need to be moved over to arch/powerpc fairly soon.
arch/ppc/platforms/4xx/ppchameleon.c line 50
Quoted 11 lines
arch/ppc/platforms/4xx/ppchameleon.c +2
-0@@ -45,7 +45,9 @@void *ppchameleon_rtc_base;extern void gen550_init (int ,struct uart_port *); +#ifdef CONFIG_SERIAL_8250 extern int early_serial_setup (struct uart_port *port); +#endif /* CONFIG_SERIAL_8250 */
This is just ugly, but not because of your patch. External function prototypes that aren't pulled from header files can lead to all kinds of wierdness. Since the code is already ugly and dangerous, I wouldn't even bother with adding the #ifdef around it.
Quoted 23 lines
arch/ppc/platforms/4xx/ppchameleon.c +4
-2/* Some IRQs unique to the board * Used by the generic 405 PCI setup functions in ppc4xx_pci.c @@ -75,6 +77,7 @@ ppc405_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)* Calculate the proper input baud rate and setup the serial driver. */ +#ifdef CONFIG_SERIAL_8250 static void __init ppchameleon_early_serial_map (void ) {@@ -105,7 +108,9 @@ ppchameleon_early_serial_map (void) printk ("Early serial init of port 0 failed\n"); } } - +#else /* CONFIG_SERIAL_8250 */ +#define ppchameleon_early_serial_map () +#endif /* CONFIG_SERIAL_8250 */ void __init board_setup_arch (void ) { --
Signature · 4 lines
Grant Likely, B.Sc. P.Eng. Secret Lab Technologies Ltd. [email protected] (403) 399-0195
Hello Grant and List!
GL> This is just ugly, but not because of your patch. External function GL> prototypes that aren't pulled from header files can lead to all kinds GL> of wierdness. Since the code is already ugly and dangerous, I GL> wouldn't even bother with adding the #ifdef around it.
Well, should I change the patch or it will be applied as is?
Best regards,
Igor Marnat mailto:[email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hello!
Quoted 4 lines
Quoted 4 lines
GL> This is just ugly, but not because of your patch. External function GL> prototypes that aren't pulled from header files can lead to all kinds GL> of wierdness. Since the code is already ugly and dangerous, I GL> wouldn't even bother with adding the #ifdef around it.
I changed the patch as you recommended. You were correct, external declarations are of no use there. At least kernel gets built successfully both with and without CONFIG_SERIAL_8250 with the patch applied. Hope it will suit better.
Author: Igor Marnat <[email protected]> Date: Tue Apr 10 11:16:35 2007 +0400
ppchameleon_early_serial_map hidden under #ifdef CONFIG_SERIAL_8250, "extern void gen550_init" and "extern int early_serial_setup" declarations removed since they are already included in header files
arch/ppc/platforms/4xx/ppchameleon.c +4 -4
@@ -44,9 +44,6 @@void *ppchameleon_rtc_base; -extern void gen550_init (int ,struct uart_port *); -extern int early_serial_setup (struct uart_port *port); -/* Some IRQs unique to the board * Used by the generic 405 PCI setup functions in ppc4xx_pci.c */
@@ -75,6 +72,7 @@ ppc405_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)* Calculate the proper input baud rate and setup the serial driver. */ +#ifdef CONFIG_SERIAL_8250 static void __init ppchameleon_early_serial_map (void ) {
@@ -105,7 +103,9 @@ ppchameleon_early_serial_map (void) printk ("Early serial init of port 0 failed\n"); } } - +#else /* CONFIG_SERIAL_8250 */ +#define ppchameleon_early_serial_map () +#endif /* CONFIG_SERIAL_8250 */ void __init board_setup_arch (void ) {
Best regards,
Igor Marnat
mailto:[email protected]