linux-mips
[Top] [All Lists]

[PATCH RESEND v3 1/4] MIPS: Lonngson64: Copy kernel command line from ar

To: James Hogan <james.hogan@mips.com>
Subject: [PATCH RESEND v3 1/4] MIPS: Lonngson64: Copy kernel command line from arcs_cmdline
From: Jiaxun Yang <jiaxun.yang@flygoat.com>
Date: Mon, 4 Dec 2017 17:23:09 +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, 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=1512379414; bh=4Q9PY5Q8LNU0DAYxUo4688wPxQDLk8vDwGzo5tOt3uI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=MImKjqX2wvRQ4+prh0XN6T5fp+mRo6C2nBkglDHiajR5cEYAHygcFKcVtjRardWdz GTFryKUgtxiE811pMDS8kA6xw/LpJPetRhpZdilV2Ysq0zAM83RjtLcpSI6OuFFPsP OCnABGRbWIEvbpKfmjc6hxE7egiCo7T0mWR7JC44=
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flygoat.com; s=mail; t=1512379412; bh=4Q9PY5Q8LNU0DAYxUo4688wPxQDLk8vDwGzo5tOt3uI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=hR1V10Ul66lO6Tso2/XfsKSW84VT6zEW7r0UVmGFaRzonTb6952+RsLYl/27xP6vt nHNhlRYi8CkktPfx4bZP3MoJ49x9l0gXKTxZS1ECd8eqRqDxDM9km2/tbn6slYZhWm xCpAJwj3Z7zaXQmmsgyfk6CzS0JZp3tX351P+hqw=
In-reply-to: <20171204092312.11256-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: <20171204092312.11256-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 c68c0cc879c6..1edf3a484e6a 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.0


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