summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2018-01-19 18:45:02 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-22 10:39:09 +0000
commit289020cc23e30dbf0a81110b6679d2a1d4d0afd5 (patch)
tree68c1cfe6b1cdb0fe6744f0c9a618091c6aba0068
parenta54c639db0fe01b52b94a182448f879e9d5fea80 (diff)
downloadpoky-289020cc23e30dbf0a81110b6679d2a1d4d0afd5.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. (From OE-Core rev: df61422d3852b96d084749c0b287ea074f7e48bf) 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>
-rw-r--r--meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch28
-rw-r--r--meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch41
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc (renamed from meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc)4
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb (renamed from meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.11.bb)0
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb (renamed from meta/recipes-bsp/u-boot/u-boot-mkimage_2017.11.bb)0
-rw-r--r--meta/recipes-bsp/u-boot/u-boot_2018.01.bb (renamed from meta/recipes-bsp/u-boot/u-boot_2017.11.bb)0
6 files changed, 1 insertions, 72 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 @@
1Nios II for MAX10 10m50 board requires update to
2its device tree to enable CPU driver during
3u-boot pre-relocation. This patch tag the CPU
4with dm-pre-reloc flag.
5
6Upstream-Status: Submitted
7
8Signed-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
14diff --git a/arch/nios2/dts/10m50_devboard.dts b/arch/nios2/dts/10m50_devboard.dts
15index 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--
272.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 @@
1From ded84f90a1066eef5f34daa4539273de64f7b811 Mon Sep 17 00:00:00 2001
2From: Stefan Agner <stefan.agner@toradex.com>
3Date: Tue, 14 Nov 2017 15:47:18 +0100
4Subject: [PATCH 1/1] envtools: make sure version/timestamp header file are
5 available
6
7With commit 84d46e7e8948 ("tools: env: allow to print U-Boot version")
8the fw_env utilities need the version.h header file. Building only
9the envtools in a pristine build directory will fail due to missing
10header files.
11
12Make sure the header files are a dependency of the envtools target.
13
14Fixes: 84d46e7e8948 ("tools: env: allow to print U-Boot version")
15Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
16Tested-by: Peter Robinson <pbrobinson@gmail.com>
17Reviewed-by: Simon Glass <sjg@chromium.org>
18
19Upstream-Status: Backport [http://git.denx.de/?p=u-boot.git;a=commit;h=ded84f90a1066eef5f34daa4539273de64f7b811]
20
21Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech>
22---
23 Makefile | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-)
25
26diff --git a/Makefile b/Makefile
27index 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--
402.7.4
41
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
index 65f1228043..d2073ea0c7 100644
--- 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"
7 7
8# We use the revision in order to avoid having to fetch it from the 8# We use the revision in order to avoid having to fetch it from the
9# repo during parse 9# repo during parse
10SRCREV = "c253573f3e269fd9a24ee6684d87dd91106018a5" 10SRCREV = "f3dd87e0b98999a78e500e8c6d2b063ebadf535a"
11 11
12SRC_URI = "git://git.denx.de/u-boot.git \ 12SRC_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 \
15 file://v2017.11-fw-utils-build-fix.patch \
16" 14"
17 15
18S = "${WORKDIR}/git" 16S = "${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
index 02887a138a..02887a138a 100644
--- 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
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
index f1fc564492..f1fc564492 100644
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.11.bb
+++ b/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
index 37c21dcaa3..37c21dcaa3 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2017.11.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2018.01.bb