lkml.org 
[lkml]   [2018]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/8] drivers: of: ifdef out cmdline section
    Date
    From: Daniel Walker <danielwa@cisco.com>

    It looks like there's some seepage of cmdline stuff into
    the generic device tree code. This conflicts with the
    generic cmdline implementation so I remove it in the case
    when that's enabled.

    Cc: Daniel Walker <dwalker@fifo99.com>
    Cc: Daniel Walker <danielwa@cisco.com>
    Signed-off-by: Daniel Walker <danielwa@cisco.com>
    Signed-off-by: Maksym Kokhan <maksym.kokhan@globallogic.com>
    ---
    drivers/of/fdt.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
    index 800ad25..74b85ad 100644
    --- a/drivers/of/fdt.c
    +++ b/drivers/of/fdt.c
    @@ -1096,7 +1096,7 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
    * managed to set the command line, unless CONFIG_CMDLINE_FORCE
    * is set in which case we override whatever was found earlier.
    */
    -#ifdef CONFIG_CMDLINE
    +#if defined(CONFIG_CMDLINE) && !defined(CONFIG_GENERIC_CMDLINE)
    #if defined(CONFIG_CMDLINE_EXTEND)
    strlcat(data, " ", COMMAND_LINE_SIZE);
    strlcat(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
    --
    2.7.4
    \
     
     \ /
      Last update: 2018-09-27 18:55    [W:5.556 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site