1*4882a593SmuzhiyunFrom ded9afa688184b3240a92c2b8f114c545a09bc3f Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
3*4882a593SmuzhiyunDate: Sat, 12 Mar 2016 23:14:41 +0100
4*4882a593SmuzhiyunSubject: [PATCH] ARM: stm32f249-disco: don't force init= in /chosen/bootargs
5*4882a593Smuzhiyun
6*4882a593SmuzhiyunThere is no reason to override the kernel's default init= value, as
7*4882a593Smuzhiyunthis breaks userspace that assumes the kernel default of /init is
8*4882a593Smuzhiyunused. Since stm32 is often used with a minimal bootloader
9*4882a593Smuzhiyun(afboot-stm32) that doesn't provide any mechanism to override the DTB,
10*4882a593Smuzhiyunwe need to adjust the kernel command line in the Device Tree source.
11*4882a593Smuzhiyun
12*4882a593SmuzhiyunSigned-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
13*4882a593Smuzhiyun---
14*4882a593Smuzhiyun arch/arm/boot/dts/stm32f429-disco.dts | 2 +-
15*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-)
16*4882a593Smuzhiyun
17*4882a593Smuzhiyundiff --git a/arch/arm/boot/dts/stm32f429-disco.dts b/arch/arm/boot/dts/stm32f429-disco.dts
18*4882a593Smuzhiyunindex f0b731d..2bae81c 100644
19*4882a593Smuzhiyun--- a/arch/arm/boot/dts/stm32f429-disco.dts
20*4882a593Smuzhiyun+++ b/arch/arm/boot/dts/stm32f429-disco.dts
21*4882a593Smuzhiyun@@ -53,7 +53,7 @@
22*4882a593Smuzhiyun 	compatible = "st,stm32f429i-disco", "st,stm32f429";
23*4882a593Smuzhiyun
24*4882a593Smuzhiyun 	chosen {
25*4882a593Smuzhiyun-		bootargs = "root=/dev/ram rdinit=/linuxrc";
26*4882a593Smuzhiyun+		bootargs = "root=/dev/ram";
27*4882a593Smuzhiyun 		stdout-path = "serial0:115200n8";
28*4882a593Smuzhiyun 	};
29*4882a593Smuzhiyun
30*4882a593Smuzhiyun--
31*4882a593Smuzhiyun2.6.4
32*4882a593Smuzhiyun
33