From mboxrd@z Thu Jan 1 00:00:00 1970 From: pavel@ucw.cz (Pavel Machek) Date: Wed, 14 Dec 2016 22:25:56 +0100 Subject: [PATCH] arm: dt: Initialize boot_command_line from CONFIG_CMDLINE in case DT does not provide /chosen/bootargs In-Reply-To: <1481749963-8664-1-git-send-email-pali.rohar@gmail.com> References: <1481749963-8664-1-git-send-email-pali.rohar@gmail.com> Message-ID: <20161214212556.GC28424@amd> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed 2016-12-14 22:12:43, Pali Roh?r wrote: > 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 Acked-by: Pavel Machek > --- 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; > -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: