From 842f67608eff54e71410f367a1a5f9128999f2c0 Mon Sep 17 00:00:00 2001 From: Vivien Didelot Date: Tue, 9 Mar 2021 12:47:15 -0500 Subject: beaglebone-yocto: allow other virtual/bootloader The beaglebone-yocto machine currently hardcodes "u-boot" as a dependency for the image and the wic format, and this prevents one from choosing a different bootloader via: PREFERRED_PROVIDER_virtual/bootloader = "non-u-boot-bootloader" Depending on "virtual/bootloader" instead of "u-boot" fixes this. Cc: Denys Dmytriyenko (From meta-yocto rev: 4c4c8327645457a5d68762ff64b64d4b5845cd20) Signed-off-by: Vivien Didelot Signed-off-by: Richard Purdie --- meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-yocto-bsp/conf') diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf index f8368ebd0e..04cbd3b5b7 100644 --- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf +++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf @@ -9,7 +9,7 @@ XSERVER ?= "xserver-xorg \ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules kernel-devicetree" -EXTRA_IMAGEDEPENDS += "u-boot" +EXTRA_IMAGEDEPENDS += "virtual/bootloader" DEFAULTTUNE ?= "cortexa8hf-neon" include conf/machine/include/tune-cortexa8.inc @@ -18,7 +18,7 @@ IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap" EXTRA_IMAGECMD_jffs2 = "-lnp " WKS_FILE ?= "beaglebone-yocto.wks" IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage" -do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot u-boot:do_deploy" +do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot virtual/bootloader:do_deploy" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -- cgit v1.2.3-54-g00ecf