diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-10-05 17:08:05 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-10-17 19:04:54 +0200 |
| commit | 3c1d6542e91a53822df620714692d53ae833ce89 (patch) | |
| tree | 76691d6669a6c0cb3278e8897a70bfb38cbeb95a | |
| parent | 7bdb81941989e28e80bf361f9c6e885e58f18db5 (diff) | |
u-boot-toradex: add wildcard after perferred version
As we add the git hash to PV otherwise one gets a warning that both
the 2020.07 and 2020.04 recipes can be built.
Due to COMPATIBLE_MACHINES the (correct) 2020.04 U-Boot is chosen also
without the patch for the i.MX 8 based machines.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit f0643dbc8548430458523f370bc902a5cef1e734)
| -rw-r--r-- | conf/machine/apalis-imx8.conf | 2 | ||||
| -rw-r--r-- | conf/machine/apalis-imx8x.conf | 2 | ||||
| -rw-r--r-- | conf/machine/colibri-imx8x.conf | 2 | ||||
| -rw-r--r-- | conf/machine/verdin-imx8mm.conf | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf index 1981b24..9506bcf 100644 --- a/conf/machine/apalis-imx8.conf +++ b/conf/machine/apalis-imx8.conf @@ -53,7 +53,7 @@ PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" # Currently we use the nxp 2020.04 downstream for mx8 as some features are # not yet available in 2020.07. -PREFERRED_VERSION_u-boot-toradex = "2020.04" +PREFERRED_VERSION_u-boot-toradex = "2020.04%" MACHINE_FIRMWARE_append = " linux-firmware-pcie8997" MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8" diff --git a/conf/machine/apalis-imx8x.conf b/conf/machine/apalis-imx8x.conf index 8d4e677..7cf5801 100644 --- a/conf/machine/apalis-imx8x.conf +++ b/conf/machine/apalis-imx8x.conf @@ -50,7 +50,7 @@ PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" # Currently we use the nxp 2020.04 downstream for mx8 as some features are # not yet available in 2020.07. -PREFERRED_VERSION_u-boot-toradex = "2020.04" +PREFERRED_VERSION_u-boot-toradex = "2020.04%" MACHINE_FIRMWARE_append = " linux-firmware-usb8997" MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8" diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf index a8090cb..b3bdb73 100644 --- a/conf/machine/colibri-imx8x.conf +++ b/conf/machine/colibri-imx8x.conf @@ -57,7 +57,7 @@ PREFERRED_PROVIDER_virtual/dtb_use-mainline-bsp = "device-tree-overlays-mainline PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" # Currently we use the nxp 2020.04 downstream for mx8 as some features are # not yet available in 2020.07. -PREFERRED_VERSION_u-boot-toradex = "2020.04" +PREFERRED_VERSION_u-boot-toradex = "2020.04%" MACHINE_FIRMWARE_append = " linux-firmware-pcie8997" MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8" diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf index 8afabbc..fd97eb9 100644 --- a/conf/machine/verdin-imx8mm.conf +++ b/conf/machine/verdin-imx8mm.conf @@ -66,7 +66,7 @@ PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" # Currently we use the nxp 2020.04 downstream for mx8 as some features are # not yet available in 2020.07. -PREFERRED_VERSION_u-boot-toradex = "2020.04" +PREFERRED_VERSION_u-boot-toradex = "2020.04%" MACHINE_FIRMWARE_append = " linux-firmware-sd8997" MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8" |