diff options
| author |   Marek Vasut <marex@denx.de> | 2018-01-19 18:45:02 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-21 09:55:14 +0000 |
| commit | df61422d3852b96d084749c0b287ea074f7e48bf (patch) | |
| tree | b07494a949b854c282b171189375986b54dfe68e /meta/recipes-bsp/u-boot/files | |
| parent | d6ac8a53d05124cbe34bc6673cb46091b50c7643 (diff) | |
| download | openembedded-core-contrib-df61422d3852b96d084749c0b287ea074f7e48bf.tar.gz | |
u-boot: Upgrade to 2018.01 release
This upgrades the U-Boot from 2017.11 to 2018.01 release
and drops patches accepted upstream.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Ross Burton <ross.burton@intel.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 @@ -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/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 @@ -From ded84f90a1066eef5f34daa4539273de64f7b811 Mon Sep 17 00:00:00 2001 -From: Stefan Agner <stefan.agner@toradex.com> -Date: Tue, 14 Nov 2017 15:47:18 +0100 -Subject: [PATCH 1/1] envtools: make sure version/timestamp header file are - available - -With commit 84d46e7e8948 ("tools: env: allow to print U-Boot version") -the fw_env utilities need the version.h header file. Building only -the envtools in a pristine build directory will fail due to missing -header files. - -Make sure the header files are a dependency of the envtools target. - -Fixes: 84d46e7e8948 ("tools: env: allow to print U-Boot version") -Signed-off-by: Stefan Agner <stefan.agner@toradex.com> -Tested-by: Peter Robinson <pbrobinson@gmail.com> -Reviewed-by: Simon Glass <sjg@chromium.org> - -Upstream-Status: Backport [http://git.denx.de/?p=u-boot.git;a=commit;h=ded84f90a1066eef5f34daa4539273de64f7b811] - -Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 61fd973..f8c66a2 100644 ---- a/Makefile -+++ b/Makefile -@@ -1447,7 +1447,7 @@ checkarmreloc: u-boot - false; \ - fi - --envtools: scripts_basic -+envtools: scripts_basic $(version_h) $(timestamp_h) - $(Q)$(MAKE) $(build)=tools/env - - tools-only: scripts_basic $(version_h) $(timestamp_h) --- -2.7.4 - |