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>

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 (file)
index 841953c..0000000
--- 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 (file)
index bd6e4a5..0000000
--- 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
-

diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc b/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc
similarity index 72%
rename from meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc
rename to meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc
index 65f1228043b16096a53334a96e0d8bbf08c50749..d2073ea0c7615f6b8c1716d4309e0ab459248d3f 100644 (file)
--- a/meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc
@@ -7,12 +7,10 @@ PE = "1"
 
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "c253573f3e269fd9a24ee6684d87dd91106018a5"
+SRCREV = "f3dd87e0b98999a78e500e8c6d2b063ebadf535a"
 
 SRC_URI = "git://git.denx.de/u-boot.git \
     file://MPC8315ERDB-enable-DHCP.patch \
-    file://10m50-update-device-tree.patch \
-    file://v2017.11-fw-utils-build-fix.patch \
 "
 
 S = "${WORKDIR}/git"

diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.11.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.11.bb
rename to meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb

diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.11.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot-mkimage_2017.11.bb
rename to meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb

diff --git a/meta/recipes-bsp/u-boot/u-boot_2017.11.bb b/meta/recipes-bsp/u-boot/u-boot_2018.01.bb
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot_2017.11.bb
rename to meta/recipes-bsp/u-boot/u-boot_2018.01.bb