diff options
author | Pavel Zhukov <pavel@zhukoff.net> | 2023-02-22 22:33:41 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-24 13:31:45 +0000 |
commit | 7e949b6ac26045eb0a1f110191fd399056b1ed74 (patch) | |
tree | 9e42f3f8e08a21719be9d401fc6f9251229bb624 | |
parent | 803e781e42b9c538119c2a56b8478149530cce6d (diff) | |
download | poky-7e949b6ac26045eb0a1f110191fd399056b1ed74.tar.gz |
u-boot: Map arm64 into map for u-boot dts installation
While arm64 is a valid UBOOT_ARCH (according to mkimage -A) u-boot
keeps arm64 specific dts under 'arch/arm' directory.
As the result the recipe tries to install arch/arm64 (if UBOOT_DTB
was specified) and fails with [1]. Remapping "arm64" to "arm" to fix this
issue.
[1]
| install: cannot stat '.../u-boot/1_2023.01-r0/build/arch/arm64/dts/u-boot.dtb': No such file or directory
(From OE-Core rev: 3ca99403d5f320c6d7ae59b107f3b3bf183b4089)
Signed-off-by: Pavel Zhukov <pavel@zhukoff.net>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 4636dd733b..b3482dcef3 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc | |||
@@ -32,7 +32,7 @@ do_savedefconfig() { | |||
32 | } | 32 | } |
33 | do_savedefconfig[nostamp] = "1" | 33 | do_savedefconfig[nostamp] = "1" |
34 | addtask savedefconfig after do_configure | 34 | addtask savedefconfig after do_configure |
35 | 35 | UBOOT_ARCH_DIR = "${@'arm' if d.getVar('UBOOT_ARCH').startswith('arm') else d.getVar('UBOOT_ARCH')}" | |
36 | do_compile () { | 36 | do_compile () { |
37 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then | 37 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then |
38 | sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' ${S}/config.mk | 38 | sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' ${S}/config.mk |
@@ -334,7 +334,7 @@ do_deploy () { | |||
334 | 334 | ||
335 | if [ -n "${UBOOT_DTB}" ] | 335 | if [ -n "${UBOOT_DTB}" ] |
336 | then | 336 | then |
337 | install -m 644 ${B}/arch/${UBOOT_ARCH}/dts/${UBOOT_DTB_BINARY} ${DEPLOYDIR}/ | 337 | install -m 644 ${B}/arch/${UBOOT_ARCH_DIR}/dts/${UBOOT_DTB_BINARY} ${DEPLOYDIR}/ |
338 | fi | 338 | fi |
339 | } | 339 | } |
340 | 340 | ||