summary refs log tree commit diff
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorJavier Martinez Canillas <javier@osg.samsung.com>2016-12-19 11:44:33 -0300
committerTony Lindgren <tony@atomide.com>2016-12-27 09:28:01 -0800
commit3d37d41a148c32389ed360e10a9f8a7cd37ce166 (patch)
tree7bf33f6f4516525732afb21e6fdcde03ecbb58bb /arch/arm/boot
parent7ce7d89f48834cefece7804d38fc5d85382edf77 (diff)
downloadlinux-3d37d41a148c32389ed360e10a9f8a7cd37ce166.tar.gz
ARM: dts: omap2: Add an empty chosen node to top level DTSI
Commit d1f3156fc8c7 ("ARM: dts: omap2: Remove skeleton.dtsi usage")
removed the skeleton.dtsi usage since we want to get rid of it.

But this can cause issues when booting a kernel with a boot-loader
that doesn't create a chosen node if this isn't present in the DTB
since the decompressor relies on a pre-existing chosen node to be
available to insert the command line and merge other ATAGS info.

Fixes: d1f3156fc8c7 ("ARM: dts: omap2: Remove skeleton.dtsi usage")
Reported-by: Pali Rohar <pali.rohar@gmail.com>
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/omap2.dtsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap2.dtsi b/arch/arm/boot/dts/omap2.dtsi
index 4f793a025a72..f1d6de8b3c19 100644
--- a/arch/arm/boot/dts/omap2.dtsi
+++ b/arch/arm/boot/dts/omap2.dtsi
@@ -17,6 +17,7 @@
 	interrupt-parent = <&intc>;
 	#address-cells = <1>;
 	#size-cells = <1>;
+	chosen { };
 
 	aliases {
 		serial0 = &uart1;