summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-13 07:29:23 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-14 14:42:18 +0000
commit4ca2fff32c99c76aa6381ef5de28955a1f0f9fa1 (patch)
tree52436f1d5febdae4ddcc793724564c37815f0820 /meta
parent3dadb9722ecf91b2fabbdbc55e73e5c9fea502e3 (diff)
downloadpoky-4ca2fff32c99c76aa6381ef5de28955a1f0f9fa1.tar.gz
u-boot: Update patch to match upstream
After discussions with upstream this version of the patch was proposed and is being submitted to upstream u-boot. Update to that version (which is better than my workaround). (From OE-Core rev: 048af2455aa65b25fd74bfe0e6d3a0af7562b42f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/u-boot/files/default-gcc.patch42
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb2
2 files changed, 29 insertions, 15 deletions
diff --git a/meta/recipes-bsp/u-boot/files/default-gcc.patch b/meta/recipes-bsp/u-boot/files/default-gcc.patch
index 76d192e355..04184df8b3 100644
--- a/meta/recipes-bsp/u-boot/files/default-gcc.patch
+++ b/meta/recipes-bsp/u-boot/files/default-gcc.patch
@@ -3,23 +3,37 @@ through the make command, it overwrites not only this setting but also the
3setting in tools/Makefile wrapped in ifneq ($(CROSS_BUILD_TOOLS),) which 3setting in tools/Makefile wrapped in ifneq ($(CROSS_BUILD_TOOLS),) which
4breaks the build. 4breaks the build.
5 5
6We therefore add a way of changing the default in the top level Makefile 6We therefore use override to ensure the value of HOSTCC is overwritten when
7without interfering with the other setting. 7needed.
8
9RP: Updated the patch to the version being submitted to upstream u-boot
8 10
9Upstream-Status: Submitted [emailed to Masahiro Yamada for discussion] 11Upstream-Status: Submitted [emailed to Masahiro Yamada for discussion]
10RP 2017/3/11 12RP 2017/3/11
11 13
12Index: git/Makefile 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
13=================================================================== 28===================================================================
14--- git.orig/Makefile 29--- git.orig/tools/env/Makefile
15+++ git/Makefile 30+++ git/tools/env/Makefile
16@@ -254,7 +254,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" 31@@ -8,7 +8,7 @@
17 else if [ -x /bin/bash ]; then echo /bin/bash; \ 32 # fw_printenv is supposed to run on the target system, which means it should be
18 else echo sh; fi ; fi) 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)
19 37
20-HOSTCC = cc 38 # Compile for a hosted environment on the target
21+DEFAULTHOSTCC = cc 39 HOST_EXTRACFLAGS = $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \
22+HOSTCC = $(DEFAULTHOSTCC)
23 HOSTCXX = c++
24 HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer \
25 $(if $(CONFIG_TOOLS_DEBUG),-g)
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb
index 9b5772ec39..1aa95e7c86 100644
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb
@@ -5,7 +5,7 @@ SRC_URI += "file://default-gcc.patch"
5SUMMARY = "U-Boot bootloader image creation tool" 5SUMMARY = "U-Boot bootloader image creation tool"
6DEPENDS = "openssl" 6DEPENDS = "openssl"
7 7
8EXTRA_OEMAKE_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" DEFAULTHOSTCC="${BUILD_CC}" STRIP=true V=1' 8EXTRA_OEMAKE_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1'
9EXTRA_OEMAKE_class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1' 9EXTRA_OEMAKE_class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1'
10EXTRA_OEMAKE_class-nativesdk = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1' 10EXTRA_OEMAKE_class-nativesdk = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1'
11 11