Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1542205

[PATCH] arm: dt: Initialize boot_command_line from CONFIG_CMDLINE in case DT does not provide /chosen/bootargs

From Pali Rohár <pali.rohar@gmail.com>
Newsgroups linux.kernel
Subject [PATCH] arm: dt: Initialize boot_command_line from CONFIG_CMDLINE in case DT does not provide /chosen/bootargs
Date 2016-12-14 22:20 +0100
Message-ID <sOp7Y-4Gu-27@gated-at.bofh.it> (permalink)
Organization linux.* mail to news gateway

Show all headers | View raw

Commit 008a2ebcd677 ("ARM: dts: omap3: Remove skeleton.dtsi usage") broke
support for setting cmdline on Nokia N900 via CONFIG_CMDLINE.

It is because arm code booted in DT mode parse cmdline only via function
early_init_dt_scan_chosen() and that function does not fill variable
boot_command_line when DTB does not contain /chosen entry. It is called
from function early_init_dt_scan_nodes() in setup_machine_fdt().

This patch fixes it by explicitly filling boot_command_line in function
setup_machine_fdt() after calling early_init_dt_scan_nodes() in case
boot_command_line still remains empty.

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
---
 arch/arm/kernel/devtree.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index f676feb..dbe25b1 100644
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -260,6 +260,11 @@ const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
 
 	early_init_dt_scan_nodes();
 
+#ifdef CONFIG_CMDLINE
+	if (!boot_command_line[0])
+		strlcpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
+#endif
+
 	/* Change machine number to match the mdesc we're using */
 	__machine_arch_type = mdesc->nr;
 
-- 
1.7.9.5

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] arm: dt: Initialize boot_command_line from CONFIG_CMDLINE in case DT does not provide /chosen/bootargs Pali Rohár <pali.rohar@gmail.com> - 2016-12-14 22:20 +0100
  Re: [PATCH] arm: dt: Initialize boot_command_line from  CONFIG_CMDLINE in case DT does not provide /chosen/bootargs Pavel Machek <pavel@ucw.cz> - 2016-12-14 22:40 +0100
    Re: [PATCH] arm: dt: Initialize boot_command_line from  CONFIG_CMDLINE in case DT does not provide /chosen/bootargs Tony Lindgren <tony@atomide.com> - 2016-12-14 22:50 +0100
  Re: [PATCH] arm: dt: Initialize boot_command_line from CONFIG_CMDLINE  in case DT does not provide /chosen/bootargs Javier Martinez Canillas <javier@dowhile0.org> - 2016-12-14 23:30 +0100
  Re: [PATCH] arm: dt: Initialize boot_command_line from  CONFIG_CMDLINE in case DT does not provide /chosen/bootargs Russell King - ARM Linux <linux@armlinux.org.uk> - 2016-12-15 01:00 +0100
    Re: [PATCH] arm: dt: Initialize boot_command_line from CONFIG_CMDLINE in case DT does not provide /chosen/bootargs Pali Rohár <pali.rohar@gmail.com> - 2016-12-15 01:10 +0100
      Re: [PATCH] arm: dt: Initialize boot_command_line from  CONFIG_CMDLINE in case DT does not provide /chosen/bootargs Russell King - ARM Linux <linux@armlinux.org.uk> - 2016-12-15 11:20 +0100
        Re: [PATCH] arm: dt: Initialize boot_command_line from CONFIG_CMDLINE in case DT does not provide /chosen/bootargs Pali Rohár <pali.rohar@gmail.com> - 2016-12-16 12:50 +0100
          Re: [PATCH] arm: dt: Initialize boot_command_line from CONFIG_CMDLINE in case DT does not provide /chosen/bootargs Pali Rohár <pali.rohar@gmail.com> - 2016-12-25 23:10 +0100
            Re: [PATCH] arm: dt: Initialize boot_command_line from  CONFIG_CMDLINE in case DT does not provide /chosen/bootargs Russell King - ARM Linux <linux@armlinux.org.uk> - 2017-01-02 15:00 +0100
      Re: [PATCH] arm: dt: Initialize boot_command_line from CONFIG_CMDLINE in case DT does not provide /chosen/bootargs Pali Rohár <pali.rohar@gmail.com> - 2016-12-16 12:50 +0100
        Re: [PATCH] arm: dt: Initialize boot_command_line from CONFIG_CMDLINE  in case DT does not provide /chosen/bootargs Javier Martinez Canillas <javier@osg.samsung.com> - 2016-12-16 13:20 +0100
          Re: [PATCH] arm: dt: Initialize boot_command_line from CONFIG_CMDLINE in case DT does not provide /chosen/bootargs Pali Rohár <pali.rohar@gmail.com> - 2016-12-16 13:40 +0100
            Re: [PATCH] arm: dt: Initialize boot_command_line from CONFIG_CMDLINE  in case DT does not provide /chosen/bootargs Javier Martinez Canillas <javier@osg.samsung.com> - 2016-12-16 13:40 +0100
              Re: [PATCH] arm: dt: Initialize boot_command_line from CONFIG_CMDLINE in case DT does not provide /chosen/bootargs Pali Rohár <pali.rohar@gmail.com> - 2016-12-16 14:00 +0100
                Re: [PATCH] arm: dt: Initialize boot_command_line from CONFIG_CMDLINE  in case DT does not provide /chosen/bootargs Javier Martinez Canillas <javier@osg.samsung.com> - 2016-12-16 14:00 +0100
                Re: [PATCH] arm: dt: Initialize boot_command_line from  CONFIG_CMDLINE in case DT does not provide /chosen/bootargs Tony Lindgren <tony@atomide.com> - 2016-12-16 16:50 +0100
                Re: [PATCH] arm: dt: Initialize boot_command_line from CONFIG_CMDLINE in case DT does not provide /chosen/bootargs Pali Rohár <pali.rohar@gmail.com> - 2016-12-16 17:20 +0100
                Re: [PATCH] arm: dt: Initialize boot_command_line from  CONFIG_CMDLINE in case DT does not provide /chosen/bootargs Tony Lindgren <tony@atomide.com> - 2016-12-16 17:30 +0100
                Re: [PATCH] arm: dt: Initialize boot_command_line from  CONFIG_CMDLINE in case DT does not provide /chosen/bootargs Russell King - ARM Linux <linux@armlinux.org.uk> - 2016-12-16 17:30 +0100
                Re: [PATCH] arm: dt: Initialize boot_command_line from  CONFIG_CMDLINE in case DT does not provide /chosen/bootargs Mark Rutland <mark.rutland@arm.com> - 2016-12-16 18:00 +0100

csiph-web