diff options
author | Gan, Yau Wai <yau.wai.gan@intel.com> | 2017-08-09 17:06:25 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-16 00:03:15 +0100 |
commit | 591db9fbd3f67145a6389c6011381221b604f16f (patch) | |
tree | 8edd830f29ca71d1c0667ce160466d04f98cc3cf /meta | |
parent | 82673ee07893589f4f609fa487abe83b8d37061b (diff) | |
download | poky-591db9fbd3f67145a6389c6011381221b604f16f.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]
(From OE-Core rev: 1e301a9f959fd3816d96cfdb6f8530898cefafce)
Signed-off-by: Gan, Yau Wai <yau.wai.gan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch | 28 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-common_2017.07.inc | 1 |
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 0000000000..841953cd10 --- /dev/null +++ b/meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | Nios II for MAX10 10m50 board requires update to | ||
2 | its device tree to enable CPU driver during | ||
3 | u-boot pre-relocation. This patch tag the CPU | ||
4 | with dm-pre-reloc flag. | ||
5 | |||
6 | Upstream-Status: Submitted | ||
7 | |||
8 | Signed-off-by: Gan, Yau Wai <yau.wai.gan@intel.com> | ||
9 | |||
10 | --- | ||
11 | arch/nios2/dts/10m50_devboard.dts | 1 + | ||
12 | 1 file changed, 1 insertion(+) | ||
13 | |||
14 | diff --git a/arch/nios2/dts/10m50_devboard.dts b/arch/nios2/dts/10m50_devboard.dts | ||
15 | index 05eac30..461ae68 100644 | ||
16 | --- a/arch/nios2/dts/10m50_devboard.dts | ||
17 | +++ b/arch/nios2/dts/10m50_devboard.dts | ||
18 | @@ -19,6 +19,7 @@ | ||
19 | #size-cells = <0>; | ||
20 | |||
21 | cpu: cpu@0 { | ||
22 | + u-boot,dm-pre-reloc; | ||
23 | device_type = "cpu"; | ||
24 | compatible = "altr,nios2-1.1"; | ||
25 | reg = <0x00000000>; | ||
26 | -- | ||
27 | 2.7.4 | ||
28 | |||
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" | |||
11 | 11 | ||
12 | SRC_URI = "git://git.denx.de/u-boot.git \ | 12 | SRC_URI = "git://git.denx.de/u-boot.git \ |
13 | file://MPC8315ERDB-enable-DHCP.patch \ | 13 | file://MPC8315ERDB-enable-DHCP.patch \ |
14 | file://10m50-update-device-tree.patch \ | ||
14 | " | 15 | " |
15 | 16 | ||
16 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |