summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiago De Franco <hiago.franco@toradex.com>2024-10-14 10:48:43 -0300
committerHiago De Franco <hiago.franco@toradex.com>2024-10-14 14:28:51 -0300
commita7b7f46516a2915c44053d011d0f117aeaa5fe44 (patch)
treefc4b913ec546e47203aeddacd4d83213cf61bd8d
parent3d982dc26f110611cc22f325d82991f60f708eb1 (diff)
machine: apalis-imx8/colibri-imx8x: update u-boot to downstream v2024.04
Since the mainline upstream U-Boot is only partly functional, use the downstream version instead. This change only applies to the downstream distro, the upstream distro will keep using the mainline upstream U-Boot. Related-to: ELB-5947 Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
-rw-r--r--conf/machine/apalis-imx8.conf4
-rw-r--r--conf/machine/colibri-imx8x.conf4
2 files changed, 2 insertions, 6 deletions
diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf
index e765dde..da67967 100644
--- a/conf/machine/apalis-imx8.conf
+++ b/conf/machine/apalis-imx8.conf
@@ -78,9 +78,7 @@ PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-u
PREFERRED_VERSION_linux-imx-headers = "6.6"
IMX_DEFAULT_BOOTLOADER = "u-boot-toradex"
-PREFERRED_VERSION_u-boot-toradex = "2024.07%"
-# With mainline distro and/or use-head-next build mainline U-Boot
-PREFERRED_VERSION_u-boot-toradex:use-head-next = "mainline"
+PREFERRED_VERSION_u-boot-toradex = "2024.04%"
PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline"
UBOOT_MAKE_TARGET:use-mainline-bsp = "all"
UBOOT_DTB_NAME:use-mainline-bsp:use-head-next = "fsl-imx8qm-apalis.dts"
diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf
index bcc16b2..fb6c683 100644
--- a/conf/machine/colibri-imx8x.conf
+++ b/conf/machine/colibri-imx8x.conf
@@ -65,9 +65,7 @@ PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline
PREFERRED_VERSION_linux-imx-headers = "6.6"
IMX_DEFAULT_BOOTLOADER = "u-boot-toradex"
-PREFERRED_VERSION_u-boot-toradex = "2024.07%"
-# With mainline distro and/or use-head-next build mainline U-Boot
-PREFERRED_VERSION_u-boot-toradex:use-head-next = "mainline"
+PREFERRED_VERSION_u-boot-toradex = "2024.04%"
PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline"
UBOOT_MAKE_TARGET:use-mainline-bsp = "all"
UBOOT_DTB_NAME:use-mainline-bsp:use-head-next = "fsl-imx8qxp-colibri.dts"