diff options
author | Mark Hatle <mark.hatle@amd.com> | 2022-09-12 18:43:54 -0700 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2022-09-12 18:43:54 -0700 |
commit | 1cd865c9c93fe48f92970676d44575bf8227a172 (patch) | |
tree | 5f649bd38a75b9f8a42675895f85ffcde8384298 /meta-xilinx-core/conf/layer.conf | |
parent | b11bfd86c25d9446e5c9fb62d377c94995f795a6 (diff) | |
parent | fb44a4e29a40c2653735358da4668c6ae2736fab (diff) | |
download | meta-xilinx-1cd865c9c93fe48f92970676d44575bf8227a172.tar.gz |
Merge branch 'honister' into kirkstone-next
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-core/conf/layer.conf')
-rw-r--r-- | meta-xilinx-core/conf/layer.conf | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index f5320ee9..112f287a 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf | |||
@@ -18,6 +18,8 @@ meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \ | |||
18 | meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bbappend \ | 18 | meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bbappend \ |
19 | virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes-*/*/*.bb \ | 19 | virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes-*/*/*.bb \ |
20 | virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes-*/*/*.bbappend \ | 20 | virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes-*/*/*.bbappend \ |
21 | xilinx-tools:${LAYERDIR}/dynamic-layers/meta-xilinx-tools/recipes-*/*/*.bb \ | ||
22 | xilinx-tools:${LAYERDIR}/dynamic-layers/meta-xilinx-tools/recipes-*/*/*.bbappend \ | ||
21 | " | 23 | " |
22 | 24 | ||
23 | LAYERDEPENDS_xilinx = "core" | 25 | LAYERDEPENDS_xilinx = "core" |
@@ -42,6 +44,17 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | |||
42 | *->xserver-xorg \ | 44 | *->xserver-xorg \ |
43 | " | 45 | " |
44 | 46 | ||
45 | XILINX_RELEASE_VERSION = "v2022.1" | 47 | XILINX_RELEASE_VERSION ??= "v2022.2" |
46 | 48 | ||
47 | XILINX_DEPRECATED[meta-xilinx] = "Kirkstone is not officially supported. See the meta-xilinx/README.kirkstone file for more information." | 49 | XILINX_DEPRECATED[meta-xilinx] = "Kirkstone is not officially supported. See the meta-xilinx/README.kirkstone file for more information." |
50 | |||
51 | BUILDCFG_VARS:append = " XILINX_RELEASE_VERSION" | ||
52 | |||
53 | PREFERRED_VERSION_qemu-xilinx ?= "v6.1.0-xilinx-${XILINX_RELEASE_VERSION}%" | ||
54 | PREFERRED_VERSION_qemu-xilinx-native ?= "v6.1.0-xilinx-${XILINX_RELEASE_VERSION}%" | ||
55 | PREFERRED_VERSION_qemu-xilinx-system-native ?= "v6.1.0-xilinx-${XILINX_RELEASE_VERSION}%" | ||
56 | PREFERRED_VERSION_qemu-devicetrees ?= "xilinx-${XILINX_RELEASE_VERSION}%" | ||
57 | PREFERRED_VERSION_arm-trusted-firmware ?= "2.6-xilinx-${XILINX_RELEASE_VERSION}%" | ||
58 | PREFERRED_VERSION_u-boot-xlnx ?= "v2021.01-xilinx-${XILINX_RELEASE_VERSION}%" | ||
59 | PREFERRED_VERSION_pmu-rom-native ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}" | ||
60 | PREFERRED_VERSION_linux-xlnx ?= "${@'5.15.19' if d.getVar("XILINX_RELEASE_VERSION") == 'v2022.1' else '5.15.36'}%" | ||