diff options
Diffstat (limited to 'meta/recipes-bsp/u-boot/files')
-rw-r--r-- | meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch | 28 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch | 41 |
2 files changed, 0 insertions, 69 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 deleted file mode 100644 index 841953cd10..0000000000 --- a/meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
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/files/v2017.11-fw-utils-build-fix.patch b/meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch deleted file mode 100644 index bd6e4a572f..0000000000 --- a/meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From ded84f90a1066eef5f34daa4539273de64f7b811 Mon Sep 17 00:00:00 2001 | ||
2 | From: Stefan Agner <stefan.agner@toradex.com> | ||
3 | Date: Tue, 14 Nov 2017 15:47:18 +0100 | ||
4 | Subject: [PATCH 1/1] envtools: make sure version/timestamp header file are | ||
5 | available | ||
6 | |||
7 | With commit 84d46e7e8948 ("tools: env: allow to print U-Boot version") | ||
8 | the fw_env utilities need the version.h header file. Building only | ||
9 | the envtools in a pristine build directory will fail due to missing | ||
10 | header files. | ||
11 | |||
12 | Make sure the header files are a dependency of the envtools target. | ||
13 | |||
14 | Fixes: 84d46e7e8948 ("tools: env: allow to print U-Boot version") | ||
15 | Signed-off-by: Stefan Agner <stefan.agner@toradex.com> | ||
16 | Tested-by: Peter Robinson <pbrobinson@gmail.com> | ||
17 | Reviewed-by: Simon Glass <sjg@chromium.org> | ||
18 | |||
19 | Upstream-Status: Backport [http://git.denx.de/?p=u-boot.git;a=commit;h=ded84f90a1066eef5f34daa4539273de64f7b811] | ||
20 | |||
21 | Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech> | ||
22 | --- | ||
23 | Makefile | 2 +- | ||
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
25 | |||
26 | diff --git a/Makefile b/Makefile | ||
27 | index 61fd973..f8c66a2 100644 | ||
28 | --- a/Makefile | ||
29 | +++ b/Makefile | ||
30 | @@ -1447,7 +1447,7 @@ checkarmreloc: u-boot | ||
31 | false; \ | ||
32 | fi | ||
33 | |||
34 | -envtools: scripts_basic | ||
35 | +envtools: scripts_basic $(version_h) $(timestamp_h) | ||
36 | $(Q)$(MAKE) $(build)=tools/env | ||
37 | |||
38 | tools-only: scripts_basic $(version_h) $(timestamp_h) | ||
39 | -- | ||
40 | 2.7.4 | ||
41 | |||