summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2016-11-07 19:20:06 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-08 10:31:30 +0000
commita4d976cb20770346ee2c8e9ac63ace5295afbc97 (patch)
tree6380034201ea81aaf02b439131afef5a707fba64
parent49ec5bae8a2f46dfe71c9b452637d4ffcbec3a93 (diff)
downloadpoky-a4d976cb20770346ee2c8e9ac63ace5295afbc97.tar.gz
u-boot: mkimage: Fix build of u-boot-mkimage
The build failed in multiple configurations. First, the native and nativesdk was using the host compiler and was pulling host libraries into the build. Second, the target configuration was attempting to execute tools/bin2header tool on host, which is compiled for target, to generate license header file that is not used by tools. This patch changes the EXTRA_OEMAKE to address these issues, to build both native and target builds with the correct compilers and correct sysroots. Moreover, this patch removes the CONFIG_CMD_LICENSE from tools build, thus disabling the execution of target tools/bin2header. (From OE-Core rev: c2980c1d2fe127d56d4c1b797df5a1047d0e2db0) Signed-off-by: Marek Vasut <marex@denx.de> Cc: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-mkimage_2016.09.01.bb10
1 files changed, 9 insertions, 1 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.09.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.09.01.bb
index 5025961f91..66edae812f 100644
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.09.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.09.01.bb
@@ -3,10 +3,18 @@ require u-boot-common_${PV}.inc
3SUMMARY = "U-Boot bootloader image creation tool" 3SUMMARY = "U-Boot bootloader image creation tool"
4DEPENDS = "openssl" 4DEPENDS = "openssl"
5 5
6EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1' 6EXTRA_OEMAKE_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" 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'
8EXTRA_OEMAKE_class-nativesdk = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1'
7 9
8do_compile () { 10do_compile () {
9 oe_runmake sandbox_defconfig 11 oe_runmake sandbox_defconfig
12
13 # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and
14 # generating it requires bin2header tool, which for target build
15 # is built with target tools and thus cannot be executed on host.
16 sed -i "s/CONFIG_CMD_LICENSE.*/# CONFIG_CMD_LICENSE is not set/" .config
17
10 oe_runmake cross_tools NO_SDL=1 18 oe_runmake cross_tools NO_SDL=1
11} 19}
12 20