From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 51509B71C5 for ; Tue, 20 Sep 2011 14:37:34 +1000 (EST) Subject: Re: [PATCH 06/20] of: Change logic to overwrite cmd_line with CONFIG_CMDLINE From: Benjamin Herrenschmidt To: Grant Likely In-Reply-To: References: <1316490307-28030-1-git-send-email-benh@kernel.crashing.org> <1316490307-28030-6-git-send-email-benh@kernel.crashing.org> Content-Type: text/plain; charset="UTF-8" Date: Tue, 20 Sep 2011 14:37:28 +1000 Message-ID: <1316493448.7975.26.camel@pasglop> Mime-Version: 1.0 Cc: linuxppc-dev@ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Mon, 2011-09-19 at 22:30 -0600, Grant Likely wrote: > On Mon, Sep 19, 2011 at 9:44 PM, Benjamin Herrenschmidt > wrote: > > We used to overwrite with CONFIG_CMDLINE if we found a chosen > > node but failed to get bootargs out of it or they were empty, > > unless CONFIG_CMDLINE_FORCE is set. > > > > Instead change that to overwrite if cmd_line is non empty after > > the bootargs check. It allows arch code to have other mechanisms > > to retrieve the command line prior to parsing the device-tree. > > > > Note: CONFIG_CMDLINE_FORCE case should ideally be handled elsewhere > > as it won't work as it-is if the device-tree has no /chosen node > > > > Signed-off-by: Benjamin Herrenschmidt > > Acked-by: Grant Likely > > But while you're in there, you should comment what you described in > the commit text. Namely that CONFIG_CMDLINE is a last resort if > nothing else managed to set the command line. In the code as a comment rather than in the commit log sounds better, let me fix that up and re-send that specific one. Cheers, Ben. > g. > > > --- > > drivers/of/fdt.c | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c > > index 65200af..d382163 100644 > > --- a/drivers/of/fdt.c > > +++ b/drivers/of/fdt.c > > @@ -683,7 +683,7 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname, > > > > #ifdef CONFIG_CMDLINE > > #ifndef CONFIG_CMDLINE_FORCE > > - if (p == NULL || l == 0 || (l == 1 && (*p) == 0)) > > + if (!cmd_line[0]) > > #endif > > strlcpy(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE); > > #endif /* CONFIG_CMDLINE */ > > -- > > 1.7.4.1 > > > > _______________________________________________ > > Linuxppc-dev mailing list > > Linuxppc-dev@lists.ozlabs.org > > https://lists.ozlabs.org/listinfo/linuxppc-dev > > > > >