From bef3a482c8b69e59b41743bd7aa1aa5c4f0d97b5 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 23 Aug 2023 16:45:42 +0200 Subject: machines: follow upstream u-boot recipe changes The upstream U-Boot recipe in meta-toradex-bsp-common was split into a pinned (currently to 2022.07) and a mainline recipe building current HEAD. For a OE master branch we always use the latest development version. Related-to: ELB-5357 Signed-off-by: Max Krummenacher --- conf/machine/include/apalis-imx6.inc | 1 + conf/machine/include/colibri-imx6.inc | 1 + conf/machine/include/colibri-imx6ull-emmc.inc | 1 + conf/machine/include/colibri-imx6ull.inc | 1 + conf/machine/include/colibri-imx7-emmc.inc | 1 + conf/machine/include/colibri-imx7.inc | 1 + conf/machine/verdin-imx8mm.conf | 2 +- conf/machine/verdin-imx8mp.conf | 2 +- 8 files changed, 8 insertions(+), 2 deletions(-) diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc index 3e1b492..9572688 100644 --- a/conf/machine/include/apalis-imx6.inc +++ b/conf/machine/include/apalis-imx6.inc @@ -31,6 +31,7 @@ PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-m PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline" IMX_DEFAULT_BOOTLOADER:apalis-imx6 = "u-boot-toradex" +PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline" 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 b99afdf..3ac6513 100644 --- a/conf/machine/include/colibri-imx6.inc +++ b/conf/machine/include/colibri-imx6.inc @@ -29,6 +29,7 @@ PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-m PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline" IMX_DEFAULT_BOOTLOADER:colibri-imx6 = "u-boot-toradex" +PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline" 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 fecf4fc..e5cdde8 100644 --- a/conf/machine/include/colibri-imx6ull-emmc.inc +++ b/conf/machine/include/colibri-imx6ull-emmc.inc @@ -21,6 +21,7 @@ PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-m PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline" IMX_DEFAULT_BOOTLOADER:colibri-imx6ull-emmc = "u-boot-toradex" +PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline" PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" UBOOT_DTB_LOADADDRESS:colibri-imx6ull-emmc = "0x88200000" diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc index 4e62719..d9dc6cc 100644 --- a/conf/machine/include/colibri-imx6ull.inc +++ b/conf/machine/include/colibri-imx6ull.inc @@ -33,6 +33,7 @@ PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-m PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline" IMX_DEFAULT_BOOTLOADER:colibri-imx6ull = "u-boot-toradex" +PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline" PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc index 33cf982..ae4bcac 100644 --- a/conf/machine/include/colibri-imx7-emmc.inc +++ b/conf/machine/include/colibri-imx7-emmc.inc @@ -30,6 +30,7 @@ PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-m PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline" IMX_DEFAULT_BOOTLOADER:colibri-imx7-emmc = "u-boot-toradex" +PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline" PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" MACHINE_FIRMWARE:remove = "firmware-imx-epdc" diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc index 4d46027..61e382f 100644 --- a/conf/machine/include/colibri-imx7.inc +++ b/conf/machine/include/colibri-imx7.inc @@ -30,6 +30,7 @@ PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-m PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline" IMX_DEFAULT_BOOTLOADER:colibri-imx7 = "u-boot-toradex" +PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline" PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot" MACHINE_FIRMWARE:remove = "firmware-imx-epdc" diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf index ceecd2d..2d144ff 100644 --- a/conf/machine/verdin-imx8mm.conf +++ b/conf/machine/verdin-imx8mm.conf @@ -84,7 +84,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 -PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "2022.07%" +PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline" # variables to control imx-boot with u-boot ATF_LOAD_ADDR = "0x920000" IMX_EXTRA_FIRMWARE = "firmware-imx-8m" diff --git a/conf/machine/verdin-imx8mp.conf b/conf/machine/verdin-imx8mp.conf index 3fed02a..c1ad515 100644 --- a/conf/machine/verdin-imx8mp.conf +++ b/conf/machine/verdin-imx8mp.conf @@ -86,7 +86,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 -PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "2022.07%" +PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline" # variables to control imx-boot with u-boot ATF_LOAD_ADDR = "0x920000" IMX_EXTRA_FIRMWARE = "firmware-imx-8m" -- cgit v1.2.3