From b7610fde4a462b54feff7e8fa4df500d28e643a0 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Tue, 2 Jun 2020 11:11:44 +0200 Subject: apalis-tk1: fix wrong PREFERRED_PROVIDER_u-boot PREFERRED_PROVIDER_u-boot should be 'u-boot-toradex-tk1' instead of 'u-boot-toradex', also set PROVIDES += "u-boot" in u-boot-tk1 recipe. Signed-off-by: Ming Liu (cherry picked from commit c9180b9e9b1231c8139bbfb47f51acb5692235dc) --- conf/machine/apalis-tk1.conf | 2 +- recipes-bsp/u-boot/u-boot-toradex-tk1_2019.07.bb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/machine/apalis-tk1.conf b/conf/machine/apalis-tk1.conf index 6fbc589..23aacc3 100644 --- a/conf/machine/apalis-tk1.conf +++ b/conf/machine/apalis-tk1.conf @@ -39,7 +39,7 @@ WIC_CREATE_EXTRA_ARGS_append = " --no-fstab-update" # The kernel lives in a seperate FAT or UBI partition, don't deploy it in /boot RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" -PREFERRED_PROVIDER_u-boot = "u-boot-toradex" +PREFERRED_PROVIDER_u-boot = "u-boot-toradex-tk1" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-tk1" PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils-tk1" UBOOT_MACHINE = "apalis-tk1_defconfig" diff --git a/recipes-bsp/u-boot/u-boot-toradex-tk1_2019.07.bb b/recipes-bsp/u-boot/u-boot-toradex-tk1_2019.07.bb index 5385b20..d3613fd 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-tk1_2019.07.bb +++ b/recipes-bsp/u-boot/u-boot-toradex-tk1_2019.07.bb @@ -5,6 +5,8 @@ require recipes-bsp/u-boot/u-boot-toradex-initial-env.inc DEPENDS += "bc-native dtc-native" DEPENDS_append_apalis-tk1 = " cbootimage-native" +PROVIDES += "u-boot" + COMPATIBLE_MACHINE = "(apalis-tk1)" SRC_URI_append_apalis-tk1 = " \ -- cgit v1.2.3