From 41b720b7628a80db40c14006d80853366df13199 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 30 Oct 2021 17:06:50 +0200 Subject: [PATCH 1/2] u-boot-tools: add missing deps and host-cc options u-boot requires openssl includes and libs on host, add the missing dependencies and set HOSTCC, HOSTCFLAGS and HOSTLDFLAGS so the build can pick up openssl from the LE toolchain Signed-off-by: Matthias Reichl --- packages/tools/u-boot-tools/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tools/u-boot-tools/package.mk b/packages/tools/u-boot-tools/package.mk index 731725b8ad..e5d24240f6 100644 --- a/packages/tools/u-boot-tools/package.mk +++ b/packages/tools/u-boot-tools/package.mk @@ -7,12 +7,12 @@ PKG_SHA256="cde723e19262e646f2670d25e5ec4b1b368490de950d4e26275a988c36df0bd4" PKG_LICENSE="GPL" PKG_SITE="https://www.denx.de/wiki/U-Boot" PKG_URL="http://ftp.denx.de/pub/u-boot/u-boot-${PKG_VERSION}.tar.bz2" -PKG_DEPENDS_HOST="ccache:host bison:host flex:host" +PKG_DEPENDS_HOST="ccache:host bison:host flex:host openssl:host pkg-config:host" PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems." make_host() { make qemu-x86_64_defconfig - make tools-only + make tools-only HOSTCC="${HOST_CC}" HOSTCFLAGS="-I${TOOLCHAIN}/include" HOSTLDFLAGS="${HOST_LDFLAGS}" } make_target() { From b075c10e7175f985718f37883b298d1c782b7424 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 30 Oct 2021 17:10:45 +0200 Subject: [PATCH 2/2] u-boot: add missing deps and host-cc options u-boot requires openssl includes and libs on host, add the missing dependencies and set HOSTCFLAGS so the build can pick up openssl from the LE toolchain. Also fix HOSTLDFLAGS to use HOST_LDFLAGS which adds an rpath to toolchain/lib so the dynamic linker uses our openssl libs, not those from the host. Signed-off-by: Matthias Reichl --- packages/tools/u-boot/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk index faf88c9528..ee34e34926 100644 --- a/packages/tools/u-boot/package.mk +++ b/packages/tools/u-boot/package.mk @@ -6,7 +6,7 @@ PKG_NAME="u-boot" PKG_ARCH="arm aarch64" PKG_LICENSE="GPL" PKG_SITE="https://www.denx.de/wiki/U-Boot" -PKG_DEPENDS_TARGET="toolchain openssl:host Python3:host swig:host" +PKG_DEPENDS_TARGET="toolchain openssl:host pkg-config:host Python3:host swig:host" PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems." PKG_STAMP="${UBOOT_SYSTEM} ${UBOOT_TARGET}" @@ -62,7 +62,7 @@ make_target() { DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm make mrproper [ -n "${UBOOT_FIRMWARE}" ] && find_file_path bootloader/firmware && . ${FOUND_PATH} DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm make $(${ROOT}/${SCRIPTS}/uboot_helper ${PROJECT} ${DEVICE} ${UBOOT_SYSTEM} config) - DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm _python_sysroot="${TOOLCHAIN}" _python_prefix=/ _python_exec_prefix=/ make ${UBOOT_TARGET} HOSTCC="${HOST_CC}" HOSTLDFLAGS="-L${TOOLCHAIN}/lib" HOSTSTRIP="true" CONFIG_MKIMAGE_DTC_PATH="scripts/dtc/dtc" + DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm _python_sysroot="${TOOLCHAIN}" _python_prefix=/ _python_exec_prefix=/ make ${UBOOT_TARGET} HOSTCC="${HOST_CC}" HOSTCFLAGS="-I${TOOLCHAIN}/include" HOSTLDFLAGS="${HOST_LDFLAGS}" HOSTSTRIP="true" CONFIG_MKIMAGE_DTC_PATH="scripts/dtc/dtc" fi }