lkml.org 
[lkml]   [2021]   [Mar]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 02/17] drivers: of: use cmdline building function
    Date
    This patch uses the new cmdline building function to
    concatenate the of provided cmdline with built-in parts
    based on compile-time options.

    Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
    ---
    drivers/of/fdt.c | 23 ++++-------------------
    1 file changed, 4 insertions(+), 19 deletions(-)

    diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
    index dcc1dd96911a..cf2b95b8f298 100644
    --- a/drivers/of/fdt.c
    +++ b/drivers/of/fdt.c
    @@ -25,6 +25,7 @@
    #include <linux/serial_core.h>
    #include <linux/sysfs.h>
    #include <linux/random.h>
    +#include <linux/cmdline.h>

    #include <asm/setup.h> /* for COMMAND_LINE_SIZE */
    #include <asm/page.h>
    @@ -1050,26 +1051,10 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,

    /* Retrieve command line */
    p = of_get_flat_dt_prop(node, "bootargs", &l);
    - if (p != NULL && l > 0)
    - strlcpy(data, p, min(l, COMMAND_LINE_SIZE));
    + if (l <= 0)
    + p = NULL;

    - /*
    - * CONFIG_CMDLINE is meant to be a default in case nothing else
    - * 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_EXTEND)
    - strlcat(data, " ", COMMAND_LINE_SIZE);
    - strlcat(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
    -#elif defined(CONFIG_CMDLINE_FORCE)
    - strlcpy(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
    -#else
    - /* No arguments from boot loader, use kernel's cmdl*/
    - if (!((char *)data)[0])
    - strlcpy(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
    -#endif
    -#endif /* CONFIG_CMDLINE */
    + cmdline_build(data, p, COMMAND_LINE_SIZE);

    pr_debug("Command line is: %s\n", (char *)data);

    --
    2.25.0
    \
     
     \ /
      Last update: 2021-03-26 14:47    [W:8.584 / U:0.340 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site