From d04a947b6b2fee6359aa6126068f70efaa3e48bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sat, 28 May 2022 14:18:06 +0200 Subject: uboot-imx: fix wrong make flags overriding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Buidbots are currently choking on the following compile error: In file included from tools/aisimage.c:9: include/image.h:1133:12: fatal error: openssl/evp.h: No such file or directory # include ^~~~~~~~~~~~~~~ compilation terminated. This is caused by a complete overriding of make flags which are provided correctly in `UBOOT_MAKE_FLAGS` variable, but currently overriden instead of extended. This then leads to the usage of build host include dirs, which are not available. Fix it by extending `UBOOT_MAKE_FLAGS` variable in all device recipes. Signed-off-by: Petr Štetiar (cherry picked from commit 481339a0426698adaa0254b479807efde0428de9) --- package/boot/uboot-imx/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package') diff --git a/package/boot/uboot-imx/Makefile b/package/boot/uboot-imx/Makefile index 2faa48bd73..cc43269782 100644 --- a/package/boot/uboot-imx/Makefile +++ b/package/boot/uboot-imx/Makefile @@ -23,7 +23,7 @@ endef define U-Boot/apalis_imx6 NAME:=Toradex Apalis UBOOT_IMAGE:=SPL u-boot.img u-boot-with-spl.imx - UBOOT_MAKE_FLAGS:=SPL u-boot.img u-boot-with-spl.imx + UBOOT_MAKE_FLAGS+=SPL u-boot.img u-boot-with-spl.imx BUILD_SUBTARGET:=cortexa9 BUILD_DEVICES:=toradex_apalis endef @@ -31,7 +31,7 @@ endef define U-Boot/mx6cuboxi NAME:=SolidRun Cubox-i boards UBOOT_IMAGE:=SPL u-boot.img - UBOOT_MAKE_FLAGS:=SPL u-boot.img + UBOOT_MAKE_FLAGS+=SPL u-boot.img BUILD_SUBTARGET:=cortexa9 BUILD_DEVICES:=solidrun_cubox-i endef -- cgit v1.2.3