From fb44a4e29a40c2653735358da4668c6ae2736fab Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 12 Sep 2022 17:14:45 -0700 Subject: User can now set XILINX_RELEASE_VERSION to either 'v2022.1' or 'v2022.2' This will in-turn select the preferred version for various components to match a given release. It is advise that the user use the latest version whenever possible, but if they are stuck on an older version of Vivado they may need to select the older release. Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/layer.conf | 2 ++ meta-xilinx-contrib/conf/layer.conf | 2 -- meta-xilinx-core/conf/layer.conf | 13 ++++++++++++- meta-xilinx-core/conf/local.conf.sample | 2 +- meta-xilinx-standalone/conf/layer.conf | 7 ++++++- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/meta-xilinx-bsp/conf/layer.conf b/meta-xilinx-bsp/conf/layer.conf index b5bb3b19..ef9e1a1d 100644 --- a/meta-xilinx-bsp/conf/layer.conf +++ b/meta-xilinx-bsp/conf/layer.conf @@ -17,3 +17,5 @@ BBFILE_PRIORITY_xilinx-bsp = "5" LAYERDEPENDS_xilinx-bsp = "xilinx" LAYERSERIES_COMPAT_xilinx-bsp = "honister" + +PREFERRED_VERSION_kc705-bitstream ?= "${XILINX_RELEASE_VERSION}" diff --git a/meta-xilinx-contrib/conf/layer.conf b/meta-xilinx-contrib/conf/layer.conf index 253d64d1..4b813365 100644 --- a/meta-xilinx-contrib/conf/layer.conf +++ b/meta-xilinx-contrib/conf/layer.conf @@ -13,5 +13,3 @@ LAYERDEPENDS_xilinx-contrib = "core" LAYERDEPENDS_xilinx-contrib = "xilinx" LAYERSERIES_COMPAT_xilinx-contrib = "honister" - -XILINX_RELEASE_VERSION = "v2022.2" diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index bdf14ee9..9090abe6 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -44,4 +44,15 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ *->xserver-xorg \ " -XILINX_RELEASE_VERSION = "v2022.2" +XILINX_RELEASE_VERSION ??= "v2022.2" + +BUILDCFG_VARS:append = " XILINX_RELEASE_VERSION" + +PREFERRED_VERSION_qemu-xilinx ?= "v6.1.0-xilinx-${XILINX_RELEASE_VERSION}%" +PREFERRED_VERSION_qemu-xilinx-native ?= "v6.1.0-xilinx-${XILINX_RELEASE_VERSION}%" +PREFERRED_VERSION_qemu-xilinx-system-native ?= "v6.1.0-xilinx-${XILINX_RELEASE_VERSION}%" +PREFERRED_VERSION_qemu-devicetrees ?= "xilinx-${XILINX_RELEASE_VERSION}%" +PREFERRED_VERSION_arm-trusted-firmware ?= "2.6-xilinx-${XILINX_RELEASE_VERSION}%" +PREFERRED_VERSION_u-boot-xlnx ?= "v2021.01-xilinx-${XILINX_RELEASE_VERSION}%" +PREFERRED_VERSION_pmu-rom-native ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}" +PREFERRED_VERSION_linux-xlnx ?= "${@'5.15.19' if d.getVar("XILINX_RELEASE_VERSION") == 'v2022.1' else '5.15.36'}%" diff --git a/meta-xilinx-core/conf/local.conf.sample b/meta-xilinx-core/conf/local.conf.sample index b907b072..10134d53 100644 --- a/meta-xilinx-core/conf/local.conf.sample +++ b/meta-xilinx-core/conf/local.conf.sample @@ -206,7 +206,7 @@ BB_DISKMON_DIRS ??= "\ #file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ #file://.* file:///some/local/dir/sstate/PATH" -XILINX_VER_MAIN = "2022.2" +XILINX_RELEASE_VERSION = "v2022.2" # Uncomment below lines to provide path for custom xsct trim # diff --git a/meta-xilinx-standalone/conf/layer.conf b/meta-xilinx-standalone/conf/layer.conf index 79997d24..492dda6f 100644 --- a/meta-xilinx-standalone/conf/layer.conf +++ b/meta-xilinx-standalone/conf/layer.conf @@ -16,4 +16,9 @@ LAYERDEPENDS_xilinx-standalone = "core xilinx" LAYERRECOMMENDS_xilinx-standalone = "xilinx-microblaze" LAYERSERIES_COMPAT_xilinx-standalone = "honister" -XILINX_RELEASE_VERSION = "v2022.2" + +PREFERRED_VERSION_plm-firmware ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}%" +PREFERRED_VERSION_psm-firmware ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}%" +PREFERRED_VERSION_pmu-firmware ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}%" +PREFERRED_VERSION_fsbl-firmware ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}%" + -- cgit v1.2.3-54-g00ecf