summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/u-boot
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-bsp/u-boot')
-rw-r--r--meta/recipes-bsp/u-boot/files/default-gcc.patch25
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-mkimage_2017.01.bb4
2 files changed, 28 insertions, 1 deletions
diff --git a/meta/recipes-bsp/u-boot/files/default-gcc.patch b/meta/recipes-bsp/u-boot/files/default-gcc.patch
new file mode 100644
index 0000000000..76d192e355
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/files/default-gcc.patch
@@ -0,0 +1,25 @@
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 add a way of changing the default in the top level Makefile
7without interfering with the other setting.
8
9Upstream-Status: Submitted [emailed to Masahiro Yamada for discussion]
10RP 2017/3/11
11
12Index: git/Makefile
13===================================================================
14--- git.orig/Makefile
15+++ git/Makefile
16@@ -254,7 +254,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
17 else if [ -x /bin/bash ]; then echo /bin/bash; \
18 else echo sh; fi ; fi)
19
20-HOSTCC = cc
21+DEFAULTHOSTCC = cc
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 c110226710..9b5772ec39 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
@@ -1,9 +1,11 @@
1require u-boot-common_${PV}.inc 1require u-boot-common_${PV}.inc
2 2
3SRC_URI += "file://default-gcc.patch"
4
3SUMMARY = "U-Boot bootloader image creation tool" 5SUMMARY = "U-Boot bootloader image creation tool"
4DEPENDS = "openssl" 6DEPENDS = "openssl"
5 7
6EXTRA_OEMAKE_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1' 8EXTRA_OEMAKE_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" DEFAULTHOSTCC="${BUILD_CC}" STRIP=true V=1'
7EXTRA_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'
8EXTRA_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'
9 11