On Mon, Sep 19, 2011 at 9:44 PM, Benjamin Herrenschmidt <b...@kernel.crashing.org> 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 <b...@kernel.crashing.org>
Acked-by: Grant Likely <grant.lik...@secretlab.ca> 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. 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 > -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
