From 66a76e7cc7b8be2965e7cd9093053f8e5ab71a96 Mon Sep 17 00:00:00 2001 From: Vivien Didelot Date: Mon, 10 Jan 2022 11:56:39 -0500 Subject: 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 Signed-off-by: Richard Purdie --- meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta-yocto-bsp/conf/machine') 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" -- cgit v1.2.3-54-g00ecf