From 5c33f703510963f5739174dc83afed7dd372750f Mon Sep 17 00:00:00 2001 From: Nicola Lunghi Date: Wed, 1 Apr 2020 07:54:17 +0100 Subject: u-boot-fslc-fw-utils: set correctly make source build dir This partially revert commit 4e5c7e0d4959b027698e15565df7d3286e6860fa: u-boot-fslc: Set build dir only for u-boot recipe Not setting the build dir in u-boot-fslc-common is breaking the build of u-boot-fslc-mxsboot. Instead of unsetting ${B}, set correctly the output and source dir in make Signed-off-by: Nicola Lunghi --- recipes-bsp/u-boot/u-boot-fslc-common_2020.01.inc | 1 + recipes-bsp/u-boot/u-boot-fslc-fw-utils_2020.01.bb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2020.01.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2020.01.inc index 6e5e5986..aa5c5d73 100644 --- a/recipes-bsp/u-boot/u-boot-fslc-common_2020.01.inc +++ b/recipes-bsp/u-boot/u-boot-fslc-common_2020.01.inc @@ -16,3 +16,4 @@ SRCBRANCH = "2020.01+fslc" PV = "v2020.01+git${SRCPV}" S = "${WORKDIR}/git" +B = "${WORKDIR}/build" diff --git a/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2020.01.bb b/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2020.01.bb index a809a3f6..82763eb9 100644 --- a/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2020.01.bb +++ b/recipes-bsp/u-boot/u-boot-fslc-fw-utils_2020.01.bb @@ -10,8 +10,8 @@ EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" inherit uboot-config do_compile () { - oe_runmake ${UBOOT_MACHINE} - oe_runmake envtools + oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} + oe_runmake -C ${S} O=${B} envtools } do_install () { -- cgit v1.2.3-54-g00ecf