lkml.org 
[lkml]   [2020]   [Aug]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 06/13] MIPS: generic: Init command line with fw_init_cmdline()
    Date
    The function bootcmdline_init() in arch/mips/kernel/setup.c will
    populate the boot_command_line string using the parameters hardcoded in
    the kernel, and those provided in the devicetree file. Then, it would
    append the content of the arcs_cmdline variable, which is filled by the
    board's plat_mem_setup() function.

    The plat_mem_setup() function for the generic MIPS board would just copy
    the current boot_command_line to arcs_cmdline, which is nonsense for two
    reasons:
    - the result will be appended to the boot_command_line anyway, so all it
    does is duplicate every single parameter on the command line;
    - the code did not perform at all what it's supposed to, which is to
    retrieve the parameters passed by the bootloader.

    Fix this by calling fw_init_cmdline() in plat_mem_setup(), which will
    properly initialize arcs_cmdline to the parameters passed by the
    bootloader.

    Signed-off-by: Paul Cercueil <paul@crapouillou.net>
    ---

    Notes:
    v2: New patch

    arch/mips/generic/init.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/mips/generic/init.c b/arch/mips/generic/init.c
    index 805d0135a9f4..029f47ea390c 100644
    --- a/arch/mips/generic/init.c
    +++ b/arch/mips/generic/init.c
    @@ -106,7 +106,7 @@ void __init plat_mem_setup(void)
    if (mach && mach->fixup_fdt)
    fdt = mach->fixup_fdt(fdt, mach_match_data);

    - strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE);
    + fw_init_cmdline();
    __dt_setup_arch((void *)fdt);
    }

    --
    2.28.0
    \
     
     \ /
      Last update: 2020-08-12 02:16    [W:4.188 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site