diff options
author | Vivien Didelot <vdidelot@pbsc.com> | 2021-03-09 12:47:15 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-11 14:06:46 +0000 |
commit | 842f67608eff54e71410f367a1a5f9128999f2c0 (patch) | |
tree | 82fd3df9aef6035e9cc530039e98a73f599422ea /meta-yocto-bsp/conf | |
parent | d9dba959430dd49030aa1ba3f62b5f7534d0e17a (diff) | |
download | poky-842f67608eff54e71410f367a1a5f9128999f2c0.tar.gz |
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 <denis@denix.org>
(From meta-yocto rev: 4c4c8327645457a5d68762ff64b64d4b5845cd20)
Signed-off-by: Vivien Didelot <vdidelot@pbsc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp/conf')
-rw-r--r-- | meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 4 |
1 files changed, 2 insertions, 2 deletions
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 \ | |||
9 | 9 | ||
10 | MACHINE_EXTRA_RRECOMMENDS = "kernel-modules kernel-devicetree" | 10 | MACHINE_EXTRA_RRECOMMENDS = "kernel-modules kernel-devicetree" |
11 | 11 | ||
12 | EXTRA_IMAGEDEPENDS += "u-boot" | 12 | EXTRA_IMAGEDEPENDS += "virtual/bootloader" |
13 | 13 | ||
14 | DEFAULTTUNE ?= "cortexa8hf-neon" | 14 | DEFAULTTUNE ?= "cortexa8hf-neon" |
15 | include conf/machine/include/tune-cortexa8.inc | 15 | include conf/machine/include/tune-cortexa8.inc |
@@ -18,7 +18,7 @@ IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap" | |||
18 | EXTRA_IMAGECMD_jffs2 = "-lnp " | 18 | EXTRA_IMAGECMD_jffs2 = "-lnp " |
19 | WKS_FILE ?= "beaglebone-yocto.wks" | 19 | WKS_FILE ?= "beaglebone-yocto.wks" |
20 | IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage" | 20 | IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage" |
21 | do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot u-boot:do_deploy" | 21 | do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot virtual/bootloader:do_deploy" |
22 | 22 | ||
23 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" | 23 | SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" |
24 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | 24 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" |