Received: from milmhbs1.lsil.com (147.145.21.209) by coscas01.lsi.com
 (172.21.36.60) with Microsoft SMTP Server id 8.1.393.1; Mon, 21 Dec 2009
 08:49:50 -0700
Received: from mail2.lsil.com (mail2.lsil.com [147.145.40.22])	by
 milmhbs1.lsil.com (8.12.11/8.12.11) with ESMTP id nBLFnlBu008493	for
 <andy.sharp@lsi.com>; Mon, 21 Dec 2009 07:49:49 -0800
Received: from psmtp.com (na3sys009amx175.postini.com [74.125.149.156])	by
 mail2.lsil.com (8.12.11/8.12.11) with SMTP id nBLFjMUI014870	for
 <andy.sharp@lsi.com>; Mon, 21 Dec 2009 07:45:27 -0800 (PST)
Received: from source ([78.24.191.182]) by na3sys009amx175.postini.com
 ([74.125.148.14]) with SMTP;	Mon, 21 Dec 2009 07:49:45 PST
Received: from localhost.localdomain ([127.0.0.1]:51124 "EHLO
        eddie.linux-mips.org" rhost-flags-OK-OK-OK-FAIL)        by
 eddie.linux-mips.org with ESMTP id S1494901AbZLUPt3 (ORCPT
        <rfc822;andy.sharp@lsi.com>); Mon, 21 Dec 2009 16:49:29 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 21 Dec 2009 16:49:12
 +0100 (CET)
Received: from mv-drv-hcb003.ocn.ad.jp ([118.23.109.133]:46452 "EHLO
        mv-drv-hcb003.ocn.ad.jp" rhost-flags-OK-OK-OK-OK)        by
 eddie.linux-mips.org with ESMTP id S1494900AbZLUPtI (ORCPT
        <rfc822;linux-mips@linux-mips.org>); Mon, 21 Dec 2009 16:49:08 +0100
Received: from vcmba.ocn.ne.jp (localhost.localdomain [127.0.0.1])        by
 mv-drv-hcb003.ocn.ad.jp (Postfix) with ESMTP id 3B59F56421D;        Tue, 22
 Dec 2009 00:49:02 +0900 (JST)
Received: from localhost.localdomain (softbank221040169135.bbtec.net
 [221.40.169.135])        by vcmba.ocn.ne.jp (Postfix) with ESMTP;        Tue,
 22 Dec 2009 00:49:02 +0900 (JST)
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
To: "linux-mips@linux-mips.org" <linux-mips@linux-mips.org>
CC: "ralf@linux-mips.org" <ralf@linux-mips.org>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Mon, 21 Dec 2009 08:48:57 -0700
Subject: [PATCH] TXx9: Cleanup builtin-cmdline processing
Thread-Topic: [PATCH] TXx9: Cleanup builtin-cmdline processing
Thread-Index: AcqCVTsS9D+bLHMITe64edTkrMIaBQ==
Message-ID: <1261410537-7921-1-git-send-email-anemo@mba.ocn.ne.jp>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Anonymous
X-MS-Exchange-Organization-AuthSource: coscas01.lsi.com
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-scanned-by: MIMEDefang 2.39
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-levels: (S:96.76228/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-pstn-settings: 3 (1.0000:1.0000) s cv gt3 gt2 gt1 r p m c 
x-pstn-addresses: from <anemo@mba.ocn.ne.jp> [22/1] 
x-pstn-neptune: 0/0/0.00/0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

Since commit 6acc7d ("Fix and enhance built-in kernel command line")
arcs_cmdline[] does not contain built-in command line.  The commit
introduce CONFIG_CMDLINE_BOOL and CONFIG_CMDLINE_OVERRIDE to control
built-in command line, and now we can use them instead of
platform-specific built-in command line processing.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
---
 arch/mips/txx9/generic/setup.c |   21 ---------------------
 1 files changed, 0 insertions(+), 21 deletions(-)

diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.=
c
index 06e801c..e27809b 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -160,7 +160,6 @@ static void __init prom_init_cmdline(void)
 	int argc;
 	int *argv32;
 	int i;			/* Always ignore the "-c" at argv[0] */
-	static char builtin[COMMAND_LINE_SIZE] __initdata;
=20
 	if (fw_arg0 >=3D CKSEG0 || fw_arg1 < CKSEG0) {
 		/*
@@ -174,20 +173,6 @@ static void __init prom_init_cmdline(void)
 		argv32 =3D (int *)fw_arg1;
 	}
=20
-	/* ignore all built-in args if any f/w args given */
-	/*
-	 * But if built-in strings was started with '+', append them
-	 * to command line args.  If built-in was started with '-',
-	 * ignore all f/w args.
-	 */
-	builtin[0] =3D '\0';
-	if (arcs_cmdline[0] =3D=3D '+')
-		strcpy(builtin, arcs_cmdline + 1);
-	else if (arcs_cmdline[0] =3D=3D '-') {
-		strcpy(builtin, arcs_cmdline + 1);
-		argc =3D 0;
-	} else if (argc <=3D 1)
-		strcpy(builtin, arcs_cmdline);
 	arcs_cmdline[0] =3D '\0';
=20
 	for (i =3D 1; i < argc; i++) {
@@ -201,12 +186,6 @@ static void __init prom_init_cmdline(void)
 		} else
 			strcat(arcs_cmdline, str);
 	}
-	/* append saved builtin args */
-	if (builtin[0]) {
-		if (arcs_cmdline[0])
-			strcat(arcs_cmdline, " ");
-		strcat(arcs_cmdline, builtin);
-	}
 }
=20
 static int txx9_ic_disable __initdata;
--=20
1.5.6.5


