diff options
Diffstat (limited to 'bsp/meta-freescale/recipes-bsp')
4 files changed, 53 insertions, 3 deletions
diff --git a/bsp/meta-freescale/recipes-bsp/imx-mkimage/imx-boot_0.2.bb b/bsp/meta-freescale/recipes-bsp/imx-mkimage/imx-boot_0.2.bb index 68492a9b..32d5aa28 100644 --- a/bsp/meta-freescale/recipes-bsp/imx-mkimage/imx-boot_0.2.bb +++ b/bsp/meta-freescale/recipes-bsp/imx-mkimage/imx-boot_0.2.bb @@ -111,7 +111,7 @@ do_compile() { # mkimage for i.MX8 for target in ${IMXBOOT_TARGETS}; do bbnote "building ${SOC_TARGET} - ${target}" - make SOC=${SOC_TARGET} ${target} + make SOC=${SOC_TARGET} dtbs=${UBOOT_DTB_NAME} ${target} if [ -e "${BOOT_STAGING}/flash.bin" ]; then cp ${BOOT_STAGING}/flash.bin ${S}/${BOOT_CONFIG_MACHINE}-${target} fi diff --git a/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx-mfgtool_2017.03.bb b/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx-mfgtool_2017.03.bb index 81799add..d5cb0339 100644 --- a/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx-mfgtool_2017.03.bb +++ b/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx-mfgtool_2017.03.bb @@ -2,5 +2,7 @@ # Copyright (C) 2014-2016 Freescale Semiconductor # Copyright 2017 NXP +FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-imx:" + require u-boot-imx_${PV}.bb require u-boot-mfgtool.inc diff --git a/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx/0001-tools-allow-to-override-python.patch b/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx/0001-tools-allow-to-override-python.patch new file mode 100755 index 00000000..f96de538 --- /dev/null +++ b/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx/0001-tools-allow-to-override-python.patch @@ -0,0 +1,46 @@ +From b48bfc74ee410b1e6681c620633ffef32aafaba0 Mon Sep 17 00:00:00 2001 +From: Stefano Babic <sbabic@denx.de> +Date: Wed, 5 Apr 2017 17:46:41 +0200 +Subject: [PATCH] tools: allow to override python + +Not force to use python from PATH. Issue was noted when building with +Yocto, because python from the distro is always taken instead of +python-native built during Yocto process. + +Signed-off-by: Stefano Babic <sbabic@denx.de> +CC: Simon Glass <sjg@chromium.org> +Reviewed-by: Simon Glass <sjg@chromium.org> +--- + Makefile | 2 +- + tools/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 09b597d450..8d4e6050b3 100644 +--- a/Makefile ++++ b/Makefile +@@ -348,7 +348,7 @@ OBJCOPY = $(CROSS_COMPILE)objcopy + OBJDUMP = $(CROSS_COMPILE)objdump + AWK = awk + PERL = perl +-PYTHON = python ++PYTHON ?= python + DTC = dtc + CHECK = sparse + +diff --git a/tools/Makefile b/tools/Makefile +index fa1b85bdae..2fc4a583d4 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -120,7 +120,7 @@ _libfdt.so-sharedobjs += $(LIBFDT_OBJS) + libfdt: + + tools/_libfdt.so: $(patsubst %.o,%.c,$(LIBFDT_OBJS)) tools/libfdt_wrap.c +- LDFLAGS="$(HOSTLDFLAGS)" python $(srctree)/lib/libfdt/setup.py \ ++ LDFLAGS="$(HOSTLDFLAGS)" ${PYTHON} $(srctree)/lib/libfdt/setup.py \ + "$(_hostc_flags)" $^ + mv _libfdt.so $@ + +-- +2.17.1 + diff --git a/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx_2017.03.bb b/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx_2017.03.bb index 705ff164..f85ed994 100644 --- a/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx_2017.03.bb +++ b/bsp/meta-freescale/recipes-bsp/u-boot/u-boot-imx_2017.03.bb @@ -11,7 +11,9 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRCBRANCH = "imx_v2017.03_4.9.123_imx8mm_ga" -SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}" +SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH} \ + file://0001-tools-allow-to-override-python.patch \ + " SRCREV = "8be98e9322040c655b9e5c9fb2c494e002e3fad9" S = "${WORKDIR}/git" @@ -35,7 +37,7 @@ do_deploy_append_mx8m() { install -d ${DEPLOYDIR}/${BOOT_TOOLS} install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME} ${DEPLOYDIR}/${BOOT_TOOLS} install -m 0777 ${B}/${config}/tools/mkimage ${DEPLOYDIR}/${BOOT_TOOLS}/mkimage_uboot - install -m 0777 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG} + install -m 0777 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin fi done unset j |