machines: u-boot: build from our own recipe

meta-toradex-bsp changed to build U-Boot from our own recipe rather
than bbappending to what openembedded-core provides. Change the
machines to use the new recipe.

Relates-to: ELB-4680
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

8 files changed, 8 insertions, 8 deletions

diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc
index 303541f..a192075 100644
--- a/conf/machine/include/apalis-imx6.inc
+++ b/conf/machine/include/apalis-imx6.inc
@@ -19,7 +19,7 @@ PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
 
-IMX_DEFAULT_BOOTLOADER:apalis-imx6 = "u-boot"
+IMX_DEFAULT_BOOTLOADER:apalis-imx6 = "u-boot-toradex"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 UBOOT_SUFFIX = "img"
 
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc
index 6a5b577..18b2007 100644
--- a/conf/machine/include/colibri-imx6.inc
+++ b/conf/machine/include/colibri-imx6.inc
@@ -21,7 +21,7 @@ PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
 
-IMX_DEFAULT_BOOTLOADER:colibri-imx6 = "u-boot"
+IMX_DEFAULT_BOOTLOADER:colibri-imx6 = "u-boot-toradex"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 UBOOT_SUFFIX = "img"
 
diff --git a/conf/machine/include/colibri-imx6ull-emmc.inc b/conf/machine/include/colibri-imx6ull-emmc.inc
index 0ec064d..82b6d4c 100644
--- a/conf/machine/include/colibri-imx6ull-emmc.inc
+++ b/conf/machine/include/colibri-imx6ull-emmc.inc
@@ -9,7 +9,7 @@ WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update"
 
 MACHINE_NAME = "Colibri-iMX6ULL-eMMC"
 
-IMX_DEFAULT_BOOTLOADER:colibri-imx6ull-emmc = "u-boot"
+IMX_DEFAULT_BOOTLOADER:colibri-imx6ull-emmc = "u-boot-toradex"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 UBOOT_MAKE_TARGET:colibri-imx6ull-emmc = "u-boot.imx"
 UBOOT_SUFFIX:colibri-imx6ull-emmc = "imx"
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
index 4c9092e..bb538a7 100644
--- a/conf/machine/include/colibri-imx6ull.inc
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -13,7 +13,7 @@ MACHINE_NAME = "Colibri-iMX6ULL"
 
 MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
 
-IMX_DEFAULT_BOOTLOADER:colibri-imx6ull = "u-boot"
+IMX_DEFAULT_BOOTLOADER:colibri-imx6ull = "u-boot-toradex"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 UBOOT_MAKE_TARGET:colibri-imx6ull = "u-boot.imx"
 UBOOT_ENTRYPOINT:colibri-imx6ull = "0x81000000"
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc
index c6c845c..fa6758c 100644
--- a/conf/machine/include/colibri-imx7-emmc.inc
+++ b/conf/machine/include/colibri-imx7-emmc.inc
@@ -21,7 +21,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     imx7d-colibri-emmc-iris-v2.dtb \
 "
 
-IMX_DEFAULT_BOOTLOADER:colibri-imx7-emmc = "u-boot"
+IMX_DEFAULT_BOOTLOADER:colibri-imx7-emmc = "u-boot-toradex"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
 TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "colibri-imx7_lcd-vga_overlay.dtbo colibri-imx7_ad7879_overlay.dtbo"
diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc
index c427a05..90abe9c 100644
--- a/conf/machine/include/colibri-imx7.inc
+++ b/conf/machine/include/colibri-imx7.inc
@@ -28,7 +28,7 @@ PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline"
 PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
 
-IMX_DEFAULT_BOOTLOADER:colibri-imx7 = "u-boot"
+IMX_DEFAULT_BOOTLOADER:colibri-imx7 = "u-boot-toradex"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
 UBOOT_MAKE_TARGET:colibri-imx7 = "u-boot.imx"
diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf
index 018c272..771864f 100644
--- a/conf/machine/verdin-imx8mm.conf
+++ b/conf/machine/verdin-imx8mm.conf
@@ -78,7 +78,7 @@ IMX_DEFAULT_BOOTLOADER = "u-boot-toradex"
 # Currently we use the nxp 2022.04 downstream for mx8
 PREFERRED_VERSION_u-boot-toradex = "2022.04%"
 # With use-mainline-bsp build mainline U-Boot
-IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot"
+PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "2022.07%"
 # if using the mainline u-boot, build imx-boot from within u-boot
 MACHINEOVERRIDES:prepend:use-mainline-bsp = "imx-boot-container:"
 # variables to control imx-boot with u-boot
diff --git a/conf/machine/verdin-imx8mp.conf b/conf/machine/verdin-imx8mp.conf
index 1d7e8c7..8d0cad5 100644
--- a/conf/machine/verdin-imx8mp.conf
+++ b/conf/machine/verdin-imx8mp.conf
@@ -80,7 +80,7 @@ IMX_DEFAULT_BOOTLOADER = "u-boot-toradex"
 # Currently we use the nxp 2022.04 downstream for mx8
 PREFERRED_VERSION_u-boot-toradex = "2022.04%"
 # With use-mainline-bsp build mainline U-Boot
-IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot"
+PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "2022.07%"
 # if using the mainline u-boot, build imx-boot from within u-boot
 MACHINEOVERRIDES:prepend:use-mainline-bsp = "imx-boot-container:"
 # variables to control imx-boot with u-boot