Messages in this thread Patch in this message | | | From | donmor <> | Subject | [PATCH] loongarch: Fix broken CONFIG_CMDLINE | Date | Sun, 9 Jul 2023 08:12:32 +0000 |
| |
From e00182944fee67301c3ebade3147b25d9f1555aa Mon Sep 17 00:00:00 2001 From: donmor <donmor3000@hotmail.com> Date: Sat, 8 Jul 2023 10:45:21 +0800 Subject: [PATCH] loongarch: Fix broken CONFIG_CMDLINE
This patch tends to fix CONFIG_CMDLINE, which is not working with CONFIG_CMDLINE_EXTEND or CONFIG_CMDLINE_BOOTLOADER. Some code is absent in arch/loongarch/kernel/setup.c, which should handle built-in command lines in CONFIG_CMDLINE. The absence of such code causes CONFIG_CMDLINE not working if CONFIG_CMDLINE_EXTEND or CONFIG_CMDLINE_BOOTLOADER is set to Y. CONFIG_CMDLINE_FORCE is not affected.
Signed-off-by: donmor <donmor3000@hotmail.com> --- arch/loongarch/kernel/setup.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c index 78a00359bde3..dc6e01c340bb 100644 --- a/arch/loongarch/kernel/setup.c +++ b/arch/loongarch/kernel/setup.c @@ -335,6 +335,22 @@ static void __init bootcmdline_init(char **cmdline_p) } #endif +#ifdef CONFIG_CMDLINE + /* + * If CONFIG_CMDLINE_BOOTLOADER is enabled then we use the built-in + * command line if no command line given, or we append given command + * line to the built-in one if CONFIG_CMDLINE_EXTEND is enabled. + */ + if (IS_ENABLED(CONFIG_CMDLINE_EXTEND)) { + strscpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE); + strlcat(boot_command_line, " ", COMMAND_LINE_SIZE); + strlcat(boot_command_line, init_command_line, COMMAND_LINE_SIZE); + } + + if (IS_ENABLED(CONFIG_CMDLINE_BOOTLOADER) && !boot_command_line[0]) + strscpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE); +#endif + out: *cmdline_p = boot_command_line; } | |