summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVivien Didelot <vivien.didelot@gmail.com>2022-01-10 11:56:39 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-01-21 14:44:27 +0000
commit66a76e7cc7b8be2965e7cd9093053f8e5ab71a96 (patch)
tree180969a859f1eb54f09e3f37244ba96871807af1
parentfc9a17ad386cef166c40b8da7511604ede83fb61 (diff)
downloadpoky-66a76e7cc7b8be2965e7cd9093053f8e5ab71a96.tar.gz
poky-66a76e7cc7b8be2965e7cd9093053f8e5ab71a96.tar.bz2
poky-66a76e7cc7b8be2965e7cd9093053f8e5ab71a96.zip
beaglebone-yocto: prefer u-boot
If BBLAYERS contains a layer providing a package for virtual/bootloader, building for the beaglebone-yocto machine will fail. Setting u-boot as the preferred provider for virtual/bootloader ensures u-boot is choosen and the build succeeds. (From meta-yocto rev: 2ffbaf54f4d88ba251d282c90755ea964d224ba6) Signed-off-by: Vivien Didelot <vdidelot@pbsc.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-yocto-bsp/conf/machine/beaglebone-yocto.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
index a5cb16cd93..9eb83cce84 100644
--- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
+++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
@@ -30,6 +30,8 @@ KERNEL_IMAGETYPE = "zImage"
KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb"
KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
+
SPL_BINARY = "MLO"
UBOOT_SUFFIX = "img"
UBOOT_MACHINE = "am335x_evm_defconfig"