summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2017-05-24 22:44:41 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-09 17:12:13 +0100
commite85889c0872ad8fb44aad28a06039bbde9dbca0b (patch)
tree84b831b9696ce372847293ed88628098795d4cd4 /meta/recipes-bsp
parent4a7612c7a12b9a381fb8343ba9586272b889fc15 (diff)
downloadpoky-e85889c0872ad8fb44aad28a06039bbde9dbca0b.tar.gz
u-boot: Update to 2017.05 release
Upgrade U-Boot to the latest version. Since the latest version has the default gcc patch in it, drop it. (From OE-Core rev: 241cd21f70a537d23147a7e7b367bfc49fda1ac5) Signed-off-by: Marek Vasut <marex@denx.de> Cc: Denys Dmytriyenko <denis@denix.org> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Cc: Ross Burton <ross.burton@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/u-boot/files/default-gcc.patch39
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-common_2017.05.inc (renamed from meta/recipes-bsp/u-boot/u-boot-common_2017.01.inc)2
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb (renamed from meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.01.bb)2
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-mkimage_2017.05.bb (renamed from meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb)2
-rw-r--r--meta/recipes-bsp/u-boot/u-boot_2017.05.bb (renamed from meta/recipes-bsp/u-boot/u-boot_2017.01.bb)0
5 files changed, 1 insertions, 44 deletions
diff --git a/meta/recipes-bsp/u-boot/files/default-gcc.patch b/meta/recipes-bsp/u-boot/files/default-gcc.patch
deleted file mode 100644
index 04184df8b3..0000000000
--- a/meta/recipes-bsp/u-boot/files/default-gcc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1OE needs to be able to change the default compiler. If we pass in HOSTCC
2through the make command, it overwrites not only this setting but also the
3setting in tools/Makefile wrapped in ifneq ($(CROSS_BUILD_TOOLS),) which
4breaks the build.
5
6We therefore use override to ensure the value of HOSTCC is overwritten when
7needed.
8
9RP: Updated the patch to the version being submitted to upstream u-boot
10
11Upstream-Status: Submitted [emailed to Masahiro Yamada for discussion]
12RP 2017/3/11
13
14Index: git/tools/Makefile
15===================================================================
16--- git.orig/tools/Makefile
17+++ git/tools/Makefile
18@@ -262,7 +262,7 @@ $(LICENSE_H): $(obj)/bin2header $(srctre
19 subdir- += env
20
21 ifneq ($(CROSS_BUILD_TOOLS),)
22-HOSTCC = $(CC)
23+override HOSTCC = $(CC)
24
25 quiet_cmd_crosstools_strip = STRIP $^
26 cmd_crosstools_strip = $(STRIP) $^; touch $@
27Index: git/tools/env/Makefile
28===================================================================
29--- git.orig/tools/env/Makefile
30+++ git/tools/env/Makefile
31@@ -8,7 +8,7 @@
32 # fw_printenv is supposed to run on the target system, which means it should be
33 # built with cross tools. Although it may look weird, we only replace "HOSTCC"
34 # with "CC" here for the maximum code reuse of scripts/Makefile.host.
35-HOSTCC = $(CC)
36+override HOSTCC = $(CC)
37
38 # Compile for a hosted environment on the target
39 HOST_EXTRACFLAGS = $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \
diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2017.01.inc b/meta/recipes-bsp/u-boot/u-boot-common_2017.05.inc
index df24c853dd..3719aee52d 100644
--- a/meta/recipes-bsp/u-boot/u-boot-common_2017.01.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-common_2017.05.inc
@@ -7,7 +7,7 @@ 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 = "a705ebc81b7f91bbd0ef7c634284208342901149" 10SRCREV = "64c4ffa9fa223f7ae8640f9c8f3044bfa0e3bfda"
11 11
12SRC_URI = "git://git.denx.de/u-boot.git" 12SRC_URI = "git://git.denx.de/u-boot.git"
13 13
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.01.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb
index 26314990b9..c2e8f0fb84 100644
--- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.05.bb
@@ -1,7 +1,5 @@
1require u-boot-common_${PV}.inc 1require u-boot-common_${PV}.inc
2 2
3SRC_URI += "file://default-gcc.patch"
4
5SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" 3SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
6DEPENDS = "mtd-utils" 4DEPENDS = "mtd-utils"
7 5
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.05.bb
index de999e7cd5..f1fc564492 100644
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.05.bb
@@ -1,7 +1,5 @@
1require u-boot-common_${PV}.inc 1require u-boot-common_${PV}.inc
2 2
3SRC_URI += "file://default-gcc.patch"
4
5SUMMARY = "U-Boot bootloader image creation tool" 3SUMMARY = "U-Boot bootloader image creation tool"
6DEPENDS = "openssl" 4DEPENDS = "openssl"
7 5
diff --git a/meta/recipes-bsp/u-boot/u-boot_2017.01.bb b/meta/recipes-bsp/u-boot/u-boot_2017.05.bb
index 37c21dcaa3..37c21dcaa3 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2017.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2017.05.bb