summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2018-11-29 20:58:22 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-08 17:17:01 +0000
commit7f84f42cf1ddcedd64ac6243a12104264c31e6ef (patch)
tree44fc1fe13a771db58a207cc08bbacb3f72493f71 /meta
parentede2e5b4b39564a1969747f13ea726ce3a92cbbe (diff)
downloadpoky-7f84f42cf1ddcedd64ac6243a12104264c31e6ef.tar.gz
u-boot-tools: fix compile error
It uses sandbox_defconfig to produce u-boot tools. But EFI is only supported by arm and x86, then it fails to run task do_compile on other arches: | include/config_distro_bootcmd.h:267:3: error: #error "sandbox EFI | support is only supported on ARM and x86" Only enable EFI support for u-boot-tools on x86 and arm to fix the issue. (From OE-Core rev: f79039497a6bb8521d5dc076924b6eb2626607c5) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/u-boot/u-boot-tools_2018.11.bb9
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2018.11.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2018.11.bb
index 127c4c15d1..7893d2aebc 100644
--- a/meta/recipes-bsp/u-boot/u-boot-tools_2018.11.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-tools_2018.11.bb
@@ -17,13 +17,20 @@ EXTRA_OEMAKE_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS
17EXTRA_OEMAKE_class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1' 17EXTRA_OEMAKE_class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1'
18EXTRA_OEMAKE_class-nativesdk = 'CROSS_COMPILE="${HOST_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1' 18EXTRA_OEMAKE_class-nativesdk = 'CROSS_COMPILE="${HOST_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1'
19 19
20SED_CONFIG_EFI = '-e "s/CONFIG_EFI_LOADER=.*/# CONFIG_EFI_LOADER is not set/"'
21SED_CONFIG_EFI_x86 = ''
22SED_CONFIG_EFI_x86-64 = ''
23SED_CONFIG_EFI_arm = ''
24SED_CONFIG_EFI_armeb = ''
25SED_CONFIG_EFI_aarch64 = ''
26
20do_compile () { 27do_compile () {
21 oe_runmake sandbox_defconfig 28 oe_runmake sandbox_defconfig
22 29
23 # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and 30 # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and
24 # generating it requires bin2header tool, which for target build 31 # generating it requires bin2header tool, which for target build
25 # is built with target tools and thus cannot be executed on host. 32 # is built with target tools and thus cannot be executed on host.
26 sed -i "s/CONFIG_CMD_LICENSE=.*/# CONFIG_CMD_LICENSE is not set/" .config 33 sed -i -e "s/CONFIG_CMD_LICENSE=.*/# CONFIG_CMD_LICENSE is not set/" ${SED_CONFIG_EFI} .config
27 34
28 oe_runmake cross_tools NO_SDL=1 35 oe_runmake cross_tools NO_SDL=1
29} 36}