MIPS: netlogic: xlr: Serial support depends on CONFIG_SERIAL_8250
PATCH v2 1/1 MIPS: netlogic: xlr: Serial support depends on CONFIG_SERIAL_8250
The nlm_early_serial_setup code needs the early_serial_setup symbol which is only available if CONFIG_SERIAL_8250 is selected. Fixes the following build problem:
arch/mips/built-in.o: In function `nlm_early_serial_setup':
setup.c:(.init.text+0x274): undefined reference to `early_serial_setup'
make: *** [vmlinux] Error 1
--- arch/mips/netlogic/xlr/setup.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/mips/netlogic/xlr/setup.c +4 -0
@@ -60,6 +60,7 @@ unsigned int nlm_threads_per_core = 1;struct nlm_soc_info nlm_nodes[NLM_NR_NODES ];cpumask_t nlm_cpumask =CPU_MASK_CPU0 ; +#ifdef CONFIG_SERIAL_8250 static void __init nlm_early_serial_setup (void ) {struct uart_port s;
@@ -78,6 +79,9 @@ static void __init nlm_early_serial_setup(void) s.membase = (unsigned char __iomem *)uart_base; early_serial_setup(&s); } +#else +static inline void nlm_early_serial_setup (void ) {} +#endif static void nlm_linux_exit (void ) {
Signature · 1 line
1.8.3.2
Quoted 26 lines
The
nlm_early_serial_setupcode needs theearly_serial_setupsymbol which is only available ifCONFIG_SERIAL_8250is selected. Fixes the following build problem:
arch/mips/built-in.o: In function `nlm_early_serial_setup':
setup.c:(.init.text+0x274): undefined reference to `early_serial_setup'
make: *** [vmlinux] Error 1Signed-off-by Markos Chandras <[email protected]>--- arch/mips/netlogic/xlr/setup.c | 4 ++++ 1 file changed, 4 insertions(+)arch/mips/netlogic/xlr/setup.c +1
-0@@ -60,6 +60,7 @@ unsigned int nlm_threads_per_core = 1;struct nlm_soc_info nlm_nodes[NLM_NR_NODES ];cpumask_t nlm_cpumask =CPU_MASK_CPU0 ; +#ifdef CONFIG_SERIAL_8250 static void __init nlm_early_serial_setup (void ) {struct uart_port s;
arch/mips/netlogic/xlr/setup.c static void __init nlm_early_serial_setup(void) · line 85
Quoted 7 lines
arch/mips/netlogic/xlr/setup.c +3
-0@@ -78,6 +79,9 @@ static void __init nlm_early_serial_setup(void) s.membase = (unsigned char __iomem *)uart_base; early_serial_setup(&s); } +#else +static inline void nlm_early_serial_setup (void ) {} +#endif
The UART device is on the SoC, so adding 'select SERIAL_8250' to the Kconfig for NLM_XLP_BOARD may be a better option.
JC.
PATCH 1/1 MIPS: Netlogic: Remove XLR early serial setup
In reply to Markos ChandrasThe early serial code is not needed because we already have early printk support provided by common/earlycons.c
This change also fixes the following build error that occurs when CONFIG_SERIAL_8250 is not configured for Netlogic XLR boards:
arch/mips/built-in.o: In function `nlm_early_serial_setup':
setup.c:(.init.text+0x274): undefined reference to `early_serial_setup'
make: *** [vmlinux] Error 1
--- arch/mips/include/asm/netlogic/xlr/xlr.h | 5 ----- arch/mips/netlogic/xlr/platform.c | 4 ++-- arch/mips/netlogic/xlr/setup.c | 20 -------------------- 3 files changed, 2 insertions(+), 27 deletions(-)
arch/mips/include/asm/netlogic/xlr/xlr.h +0 -5
@@ -35,11 +35,6 @@#ifndef _ASM_NLM_XLR_H#define _ASM_NLM_XLR_H -/* Platform UART functions */ -struct uart_port ; -unsigned int nlm_xlr_uart_in (struct uart_port *,int ); -void nlm_xlr_uart_out (struct uart_port *,int ,int ); -/* SMP helpers */ void xlr_wakeup_secondary_cpus (void );
arch/mips/netlogic/xlr/platform.c +2 -2
@@ -23,7 +23,7 @@#include <asm/netlogic/xlr/pic.h> #include <asm/netlogic/xlr/xlr.h> -unsigned int nlm_xlr_uart_in (struct uart_port *p,int offset) +static unsigned int nlm_xlr_uart_in (struct uart_port *p,int offset) {uint64_t uartbase;unsigned int value;
@@ -41,7 +41,7 @@ unsigned int nlm_xlr_uart_in(struct uart_port *p, int offset)return value; } -void nlm_xlr_uart_out (struct uart_port *p,int offset,int value) +static void nlm_xlr_uart_out (struct uart_port *p,int offset,int value) {uint64_t uartbase;
arch/mips/netlogic/xlr/setup.c +0 -20
@@ -60,25 +60,6 @@ unsigned int nlm_threads_per_core = 1;struct nlm_soc_info nlm_nodes[NLM_NR_NODES ];cpumask_t nlm_cpumask =CPU_MASK_CPU0 ; -static void __init nlm_early_serial_setup (void ) -{ -struct uart_port s; -unsigned long uart_base; - - uart_base = (unsigned long )nlm_mmio_base (NETLOGIC_IO_UART_0_OFFSET ); -memset (&s,0 ,sizeof (s)); - s.flags =ASYNC_BOOT_AUTOCONF |ASYNC_SKIP_TEST ; - s.iotype =UPIO_MEM32 ; - s.regshift =2 ; - s.irq =PIC_UART_0_IRQ ; - s.uartclk =PIC_CLK_HZ ; - s.serial_in = nlm_xlr_uart_in; - s.serial_out = nlm_xlr_uart_out; - s.mapbase = uart_base; - s.membase = (unsigned char __iomem *)uart_base; -early_serial_setup (&s); -} -static void nlm_linux_exit (void ) {uint64_t gpiobase;
@@ -215,7 +196,6 @@ void __init prom_init(void)memcpy (reset_vec, (void *)nlm_reset_entry, (nlm_reset_entry_end - nlm_reset_entry)); -nlm_early_serial_setup ();build_arcs_cmdline (argv);prom_add_memory ();
Signature · 1 line
1.7.9.5