File 0030-Adjust-bcm283x-DT-to-work-with-uboo.patch of Package u-boot-cubietruck

Overview Repositories Revisions Requests Users Attributes Meta

File 0030-Adjust-bcm283x-DT-to-work-with-uboo.patch of Package u-boot-cubietruck

From f7403f8932847f69d993a8079621c8cd638443c2 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Tue, 13 Sep 2016 11:46:06 +0200
Subject: [PATCH] Adjust bcm283x DT to work with uboot

---
 arch/arm/dts/bcm2837-rpi-3-b.dts | 4 ++--
 arch/arm/dts/bcm2837.dtsi        | 2 +-
 arch/arm/dts/bcm283x.dtsi        | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/arm/dts/bcm2837-rpi-3-b.dts b/arch/arm/dts/bcm2837-rpi-3-b.dts
index 3b22035..8246e19 100644
--- a/arch/arm/dts/bcm2837-rpi-3-b.dts
+++ b/arch/arm/dts/bcm2837-rpi-3-b.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 #include "bcm2837.dtsi"
-#include "../../../../arm/boot/dts/bcm2835-rpi.dtsi"
-#include "../../../../arm/boot/dts/bcm283x-rpi-smsc9514.dtsi"
+#include "bcm2835-rpi.dtsi"
+#include "bcm283x-rpi-smsc9514.dtsi"
 
 / {
 	compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
diff --git a/arch/arm/dts/bcm2837.dtsi b/arch/arm/dts/bcm2837.dtsi
index f2a31d0..8216bbb 100644
--- a/arch/arm/dts/bcm2837.dtsi
+++ b/arch/arm/dts/bcm2837.dtsi
@@ -1,4 +1,4 @@
-#include "../../../../arm/boot/dts/bcm283x.dtsi"
+#include "bcm283x.dtsi"
 
 / {
 	compatible = "brcm,bcm2836";
diff --git a/arch/arm/dts/bcm283x.dtsi b/arch/arm/dts/bcm283x.dtsi
index c5d0c70..eba0cf6 100644
--- a/arch/arm/dts/bcm283x.dtsi
+++ b/arch/arm/dts/bcm283x.dtsi
@@ -18,7 +18,7 @@
 		bootargs = "earlyprintk console=ttyAMA0";
 	};
 
-	soc {
+	soc: soc {
 		compatible = "simple-bus";
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -509,3 +509,5 @@
 
 	};
 };
+
+#include "bcm283x-uboot.dtsi"

Places

File 0030-Adjust-bcm283x-DT-to-work-with-uboo.patch of Package u-boot-cubietruck

Places