diff options
author | Marek Vasut <marex@denx.de> | 2017-05-24 22:44:41 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-09 17:12:13 +0100 |
commit | e85889c0872ad8fb44aad28a06039bbde9dbca0b (patch) | |
tree | 84b831b9696ce372847293ed88628098795d4cd4 /meta/recipes-bsp/u-boot/files | |
parent | 4a7612c7a12b9a381fb8343ba9586272b889fc15 (diff) | |
download | poky-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/u-boot/files')
-rw-r--r-- | meta/recipes-bsp/u-boot/files/default-gcc.patch | 39 |
1 files changed, 0 insertions, 39 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 @@ | |||
1 | OE needs to be able to change the default compiler. If we pass in HOSTCC | ||
2 | through the make command, it overwrites not only this setting but also the | ||
3 | setting in tools/Makefile wrapped in ifneq ($(CROSS_BUILD_TOOLS),) which | ||
4 | breaks the build. | ||
5 | |||
6 | We therefore use override to ensure the value of HOSTCC is overwritten when | ||
7 | needed. | ||
8 | |||
9 | RP: Updated the patch to the version being submitted to upstream u-boot | ||
10 | |||
11 | Upstream-Status: Submitted [emailed to Masahiro Yamada for discussion] | ||
12 | RP 2017/3/11 | ||
13 | |||
14 | Index: 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 $@ | ||
27 | Index: 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))) \ | ||