aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorGan, Yau Wai <yau.wai.gan@intel.com>2017-08-09 17:06:25 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-16 00:01:43 +0100
commit1e301a9f959fd3816d96cfdb6f8530898cefafce (patch)
tree4350201cce3d29a1915f4a6da75d286bb73d09a6 /meta/recipes-bsp
parentc32d526a056adb8ed1eb8beb9d495bfd01af2342 (diff)
downloadopenembedded-core-contrib-1e301a9f959fd3816d96cfdb6f8530898cefafce.tar.gz
u-boot: update nios2 device tree for 10m50 board
In order for u-boot to work on Nios II architecture, the device tree file requires adding pre-relocation flag to the CPU node. Patch is tested on 10m50 board. Pass booting up Linux. [YOCTO #11628] Signed-off-by: Gan, Yau Wai <yau.wai.gan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch28
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-common_2017.07.inc1
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch b/meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch
new file mode 100644
index 00000000000..841953cd108
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch
@@ -0,0 +1,28 @@
+Nios II for MAX10 10m50 board requires update to
+its device tree to enable CPU driver during
+u-boot pre-relocation. This patch tag the CPU
+with dm-pre-reloc flag.
+
+Upstream-Status: Submitted
+
+Signed-off-by: Gan, Yau Wai <yau.wai.gan@intel.com>
+
+---
+ arch/nios2/dts/10m50_devboard.dts | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/nios2/dts/10m50_devboard.dts b/arch/nios2/dts/10m50_devboard.dts
+index 05eac30..461ae68 100644
+--- a/arch/nios2/dts/10m50_devboard.dts
++++ b/arch/nios2/dts/10m50_devboard.dts
+@@ -19,6 +19,7 @@
+ #size-cells = <0>;
+
+ cpu: cpu@0 {
++ u-boot,dm-pre-reloc;
+ device_type = "cpu";
+ compatible = "altr,nios2-1.1";
+ reg = <0x00000000>;
+--
+2.7.4
+
diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2017.07.inc b/meta/recipes-bsp/u-boot/u-boot-common_2017.07.inc
index f27989daa17..e37f5fd4091 100644
--- a/meta/recipes-bsp/u-boot/u-boot-common_2017.07.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-common_2017.07.inc
@@ -11,6 +11,7 @@ SRCREV = "d85ca029f257b53a96da6c2fb421e78a003a9943"
SRC_URI = "git://git.denx.de/u-boot.git \
file://MPC8315ERDB-enable-DHCP.patch \
+ file://10m50-update-device-tree.patch \
"
S = "${WORKDIR}/git"