[PATCH] MIPS: netlogic: xlr: Serial support depends on CONFIG_SERIAL_8250

[PATCH] MIPS: netlogic: xlr: Serial support depends on CONFIG_SERIAL_8250

[Markos Chandras]

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

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
---
This patch is for the upstream-sfr/mips-for-linux-next tree
---
 arch/mips/netlogic/xlr/setup.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/mips/netlogic/xlr/setup.c b/arch/mips/netlogic/xlr/setup.c
index 214d123..60769f7 100644
--- a/arch/mips/netlogic/xlr/setup.c
+++ b/arch/mips/netlogic/xlr/setup.c
@@ -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,7 @@ static void __init nlm_early_serial_setup(void)
 	s.membase	= (unsigned char __iomem *)uart_base;
 	early_serial_setup(&s);
 }
+#endif
 
 static void nlm_linux_exit(void)
 {
@@ -214,8 +216,9 @@ void __init prom_init(void)
 	memset(reset_vec, 0, RESET_VEC_SIZE);
 	memcpy(reset_vec, (void *)nlm_reset_entry,
 			(nlm_reset_entry_end - nlm_reset_entry));
-
+#ifdef CONFIG_SERIAL_8250
 	nlm_early_serial_setup();
+#endif
 	build_arcs_cmdline(argv);
 	prom_add_memory();
 
-- 
1.8.3.2

[PATCH] MIPS: netlogic: xlr: Serial support depends on CONFIG_SERIAL_8250

[Markos Chandras]

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

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
---
This patch is for the upstream-sfr/mips-for-linux-next tree
---
 arch/mips/netlogic/xlr/setup.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/mips/netlogic/xlr/setup.c b/arch/mips/netlogic/xlr/setup.c
index 214d123..60769f7 100644
--- a/arch/mips/netlogic/xlr/setup.c
+++ b/arch/mips/netlogic/xlr/setup.c
@@ -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,7 @@ static void __init nlm_early_serial_setup(void)
 	s.membase	= (unsigned char __iomem *)uart_base;
 	early_serial_setup(&s);
 }
+#endif
 
 static void nlm_linux_exit(void)
 {
@@ -214,8 +216,9 @@ void __init prom_init(void)
 	memset(reset_vec, 0, RESET_VEC_SIZE);
 	memcpy(reset_vec, (void *)nlm_reset_entry,
 			(nlm_reset_entry_end - nlm_reset_entry));
-
+#ifdef CONFIG_SERIAL_8250
 	nlm_early_serial_setup();
+#endif
 	build_arcs_cmdline(argv);
 	prom_add_memory();
 
-- 
1.8.3.2

Re: [PATCH] MIPS: netlogic: xlr: Serial support depends on CONFIG_SERIAL_8250

[Sergei Shtylyov]

Hello.

On 15-08-2013 12:27, Markos Chandras wrote:

> 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

> Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
> ---
> This patch is for the upstream-sfr/mips-for-linux-next tree
> ---
>   arch/mips/netlogic/xlr/setup.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)

> diff --git a/arch/mips/netlogic/xlr/setup.c b/arch/mips/netlogic/xlr/setup.c
> index 214d123..60769f7 100644
> --- a/arch/mips/netlogic/xlr/setup.c
> +++ b/arch/mips/netlogic/xlr/setup.c
> @@ -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,7 @@ static void __init nlm_early_serial_setup(void)
>   	s.membase	= (unsigned char __iomem *)uart_base;
>   	early_serial_setup(&s);
>   }

    It's better to follow what Documentation/Submitting patches suggest and add:

#else
static inline void nlm_early_serial_setup(void) {}
> +#endif
>
>   static void nlm_linux_exit(void)
>   {
> @@ -214,8 +216,9 @@ void __init prom_init(void)
>   	memset(reset_vec, 0, RESET_VEC_SIZE);
>   	memcpy(reset_vec, (void *)nlm_reset_entry,
>   			(nlm_reset_entry_end - nlm_reset_entry));
> -
> +#ifdef CONFIG_SERIAL_8250
>   	nlm_early_serial_setup();
> +#endif

    ... and avoid #ifdef here.

WBR, Sergei

Re: [PATCH] MIPS: netlogic: xlr: Serial support depends on CONFIG_SERIAL_8250

[Markos Chandras]

Hi Sergei,

On 15 August 2013 12:18, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
> Hello.
>
>
>
>    It's better to follow what Documentation/Submitting patches suggest and
> add:
>
> #else
> static inline void nlm_early_serial_setup(void) {}
>
>> +#endif
>>

Thank you for the review. I will submit a new patch.

-- 
Regards,
Markos Chandras