summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/u-boot
diff options
context:
space:
mode:
authorAlistair Francis <alistair.francis@wdc.com>2021-06-06 10:05:32 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-07 23:00:22 +0100
commit984066eb13798701349436cb32b52faaccbec5e7 (patch)
tree71e6352f526955d8d3623c1de9cca2ddca798c8d /meta/recipes-bsp/u-boot
parent6387c76f017d8ec5b01a98de0658ab390a01224f (diff)
downloadpoky-984066eb13798701349436cb32b52faaccbec5e7.tar.gz
recipes-bsp/u-boot: Allow deploying the u-boot DTB
Use ??= assignment for UBOOT_DTB_BINARY because it is set using ?= in fitImage bbclass as well, using ?= will preempt that (From OE-Core rev: efe9f33beb053c8d645bfa5791846ffaa3cbceb4) Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/u-boot')
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 5398c2e621..8ccc532f7e 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -5,7 +5,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
5 5
6DEPENDS += "kern-tools-native" 6DEPENDS += "kern-tools-native"
7 7
8inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 python3native 8inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 python3native kernel-arch
9 9
10DEPENDS += "swig-native" 10DEPENDS += "swig-native"
11 11
@@ -346,6 +346,11 @@ do_deploy () {
346 ln -sf ${UBOOT_EXTLINUX_SYMLINK} ${DEPLOYDIR}/${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE} 346 ln -sf ${UBOOT_EXTLINUX_SYMLINK} ${DEPLOYDIR}/${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE}
347 ln -sf ${UBOOT_EXTLINUX_SYMLINK} ${DEPLOYDIR}/${UBOOT_EXTLINUX_CONF_NAME} 347 ln -sf ${UBOOT_EXTLINUX_SYMLINK} ${DEPLOYDIR}/${UBOOT_EXTLINUX_CONF_NAME}
348 fi 348 fi
349
350 if [ -n "${UBOOT_DTB}" ]
351 then
352 install -m 644 ${B}/arch/${UBOOT_ARCH}/dts/${UBOOT_DTB_BINARY} ${DEPLOYDIR}/
353 fi
349} 354}
350 355
351addtask deploy before do_build after do_compile 356addtask deploy before do_build after do_compile