diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2023-08-23 16:45:42 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2023-09-20 13:20:55 -0300 |
| commit | 758654bc4cc20243f47e31aab9e4351911da745f (patch) | |
| tree | 48051451d726554054a405b9351b4b11a831f327 | |
| parent | e9a4584f89bf5d111cf048979ff32cfa67d5c34c (diff) | |
verdin-am62: follow upstream u-boot recipe changes
The upstream U-Boot recipe in meta-toradex-bsp-common was split into
a always pinned and a latest head recipe.
For a OE master branch we always use the latest development version.
Related-to: ELB-5357
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | conf/machine/verdin-am62-k3r5.conf | 5 | ||||
| -rw-r--r-- | conf/machine/verdin-am62.conf | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/conf/machine/verdin-am62-k3r5.conf b/conf/machine/verdin-am62-k3r5.conf index 0c24a57..e92d5db 100644 --- a/conf/machine/verdin-am62-k3r5.conf +++ b/conf/machine/verdin-am62-k3r5.conf @@ -9,8 +9,9 @@ require conf/machine/include/k3r5.inc PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-ti" PREFERRED_PROVIDER_u-boot = "u-boot-toradex-ti" -PREFERRED_PROVIDER_virtual/bootloader:upstream:use-head-next = "u-boot-toradex" -PREFERRED_PROVIDER_u-boot:upstream:use-head-next = "u-boot-toradex" +PREFERRED_PROVIDER_virtual/bootloader:upstream = "u-boot-toradex" +PREFERRED_PROVIDER_u-boot:upstream = "u-boot-toradex" +PREFERRED_VERSION_u-boot-toradex:upstream = "mainline" SYSFW_SOC = "am62x" SYSFW_CONFIG = "verdin" diff --git a/conf/machine/verdin-am62.conf b/conf/machine/verdin-am62.conf index 4299c2f..2b3eb77 100644 --- a/conf/machine/verdin-am62.conf +++ b/conf/machine/verdin-am62.conf @@ -30,8 +30,9 @@ PREFERRED_PROVIDER_virtual/dtb = "device-tree-overlays-ti" PREFERRED_PROVIDER_virtual/dtb:upstream = "device-tree-overlays-mainline" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-ti" PREFERRED_PROVIDER_u-boot = "u-boot-toradex-ti" -PREFERRED_PROVIDER_virtual/bootloader:upstream:use-head-next = "u-boot-toradex" -PREFERRED_PROVIDER_u-boot:upstream:use-head-next = "u-boot-toradex" +PREFERRED_PROVIDER_virtual/bootloader:upstream = "u-boot-toradex" +PREFERRED_PROVIDER_u-boot:upstream = "u-boot-toradex" +PREFERRED_VERSION_u-boot-toradex:upstream = "mainline" KERNEL_DTB_PREFIX = "ti/" KERNEL_DEVICETREE = " \ |