From 1e301a9f959fd3816d96cfdb6f8530898cefafce Mon Sep 17 00:00:00 2001 From: "Gan, Yau Wai" Date: Wed, 9 Aug 2017 17:06:25 -0700 Subject: 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 Signed-off-by: Richard Purdie --- .../u-boot/files/10m50-update-device-tree.patch | 28 ++++++++++++++++++++++ meta/recipes-bsp/u-boot/u-boot-common_2017.07.inc | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch (limited to 'meta/recipes-bsp') 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 0000000000..841953cd10 --- /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 + +--- + 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 f27989daa1..e37f5fd409 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" -- cgit 1.2.3-korg