linux-mips
[Top] [All Lists]

[PATCH v5 1/5] MIPS: Lonngson64: Copy kernel command line from arcs_cmdl

To: James Hogan <jhogan@kernel.org>
Subject: [PATCH v5 1/5] MIPS: Lonngson64: Copy kernel command line from arcs_cmdline
From: Jiaxun Yang <jiaxun.yang@flygoat.com>
Date: Sat, 16 Dec 2017 22:57:47 +0800
Authentication-results: smtp3p.mail.yandex.net; dkim=pass header.i=@flygoat.com
Cc: Ralf Baechle <ralf@linux-mips.org>, linux-mips@linux-mips.org, Huacai Chan <chenhc@lemote.com>, linux-kernel@vger.kernel.org, Jiaxun Yang <jiaxun.yang@flygoat.com>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flygoat.com; s=mail; t=1513436290; bh=t+bUxsDTW18ugUtp8HpRNPyeI6rs5TqwcstO11/SXIk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=bOpWI/aRKLSec4Gu5G33PmK3NtoQ6O6bEl8BYJ2Gmom91VaVT5T9YuC/ybMu1zsqA 5u2umi5YpqguTFG07ouRRNBzZzNhl4CBXWLoOQqeYUxbce0Y4070BWv1WiYz01WH95 m+h5vJVxLEDMciAlDYwbzVUgNKfBfFTskKb82aio=
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flygoat.com; s=mail; t=1513436289; bh=t+bUxsDTW18ugUtp8HpRNPyeI6rs5TqwcstO11/SXIk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=hA7BjJQXLmluXIZ1GEQJS0fydyczT1jaI25YfF0dx0Wg2GBTRHfKoNnRYw0lMxuFc +QjX2nrhi8ijazgXjUE6I+P6whjEj4QLbs9Em24MOah5Ag/rO+NF0E+dWTNgYcXIgf 3xLFBHViT5nxL9pWY/ZYsJu9ovUkhaTnGDuFKhY4=
In-reply-to: <20171216145751.3486-1-jiaxun.yang@flygoat.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: <20171216145751.3486-1-jiaxun.yang@flygoat.com>
Sender: linux-mips-bounce@linux-mips.org
Since lemote-2f/marchtype.c need to get cmdline from loongson.h
this patch simply copy kernel command line from arcs_cmdline
to fix that issue

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
 arch/mips/include/asm/mach-loongson64/loongson.h | 6 ++++++
 arch/mips/loongson64/common/cmdline.c            | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/arch/mips/include/asm/mach-loongson64/loongson.h 
b/arch/mips/include/asm/mach-loongson64/loongson.h
index d0ae5d55413b..39876e28b8b2 100644
--- a/arch/mips/include/asm/mach-loongson64/loongson.h
+++ b/arch/mips/include/asm/mach-loongson64/loongson.h
@@ -45,6 +45,12 @@ static inline void prom_init_uart_base(void)
 #endif
 }
 
+/*
+ * Copy kernel command line from arcs_cmdline
+ */
+#include <asm/setup.h>
+extern char loongson_cmdline[COMMAND_LINE_SIZE];
+
 /* irq operation functions */
 extern void bonito_irqdispatch(void);
 extern void __init bonito_irq_init(void);
diff --git a/arch/mips/loongson64/common/cmdline.c 
b/arch/mips/loongson64/common/cmdline.c
index 01fbed137028..49e172184e15 100644
--- a/arch/mips/loongson64/common/cmdline.c
+++ b/arch/mips/loongson64/common/cmdline.c
@@ -21,6 +21,11 @@
 
 #include <loongson.h>
 
+/* the kernel command line copied from arcs_cmdline */
+#include <linux/export.h>
+char loongson_cmdline[COMMAND_LINE_SIZE];
+EXPORT_SYMBOL(loongson_cmdline);
+
 void __init prom_init_cmdline(void)
 {
        int prom_argc;
@@ -45,4 +50,6 @@ void __init prom_init_cmdline(void)
        }
 
        prom_init_machtype();
+       /* copy arcs_cmdline into loongson_cmdline */
+       strncpy(loongson_cmdline, arcs_cmdline, COMMAND_LINE_SIZE);
 }
-- 
2.15.1


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