linux-mips
[Top] [All Lists]

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

To: Markos Chandras <markos.chandras@imgtec.com>
Subject: Re: [PATCH] MIPS: netlogic: xlr: Serial support depends on CONFIG_SERIAL_8250
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Date: Thu, 15 Aug 2013 15:18:29 +0400
Cc: linux-mips@linux-mips.org
In-reply-to: <1376555267-1633-1-git-send-email-markos.chandras@imgtec.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1376555267-1633-1-git-send-email-markos.chandras@imgtec.com>
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130801 Thunderbird/17.0.8
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


<Prev in Thread] Current Thread [Next in Thread>