summaryrefslogtreecommitdiffstats
path: root/meta-xilinx-core/conf
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@amd.com>2023-08-29 16:28:59 -0500
committerMark Hatle <mark.hatle@amd.com>2023-08-29 16:29:25 -0500
commit7238de6b473fa87798a577f9b2557057cff5c0dc (patch)
tree3aff951b5fa5d667bbff270dbc8d775b318b5c6c /meta-xilinx-core/conf
parent832330f9abe3e3a04894f65c8c718fee46e6dd9a (diff)
downloadmeta-xilinx-7238de6b473fa87798a577f9b2557057cff5c0dc.tar.gz
meta-xilinx-core: Move preferred versions to 2024.1 integration
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-core/conf')
-rw-r--r--meta-xilinx-core/conf/layer.conf6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index 5441fd96..51c3bd6d 100644
--- a/meta-xilinx-core/conf/layer.conf
+++ b/meta-xilinx-core/conf/layer.conf
@@ -42,12 +42,13 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
42 *->xserver-xorg \ 42 *->xserver-xorg \
43" 43"
44 44
45XILINX_RELEASE_VERSION ??= "v2023.2" 45XILINX_RELEASE_VERSION ??= "v2024.1"
46 46
47BUILDCFG_VARS:append = " SOC_VARIANT XILINX_RELEASE_VERSION" 47BUILDCFG_VARS:append = " SOC_VARIANT XILINX_RELEASE_VERSION"
48 48
49XILINX_QEMU_VERSION[v2023.1] = "v7.1.0-xilinx-v2023.1%" 49XILINX_QEMU_VERSION[v2023.1] = "v7.1.0-xilinx-v2023.1%"
50XILINX_QEMU_VERSION[v2023.2] = "v7.1.0-xilinx-v2023.2%" 50XILINX_QEMU_VERSION[v2023.2] = "v7.1.0-xilinx-v2023.2%"
51XILINX_QEMU_VERSION[v2024.1] = "v7.1.0-xilinx-v2024.1%"
51PREFERRED_VERSION_qemu-xilinx ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" 52PREFERRED_VERSION_qemu-xilinx ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
52PREFERRED_VERSION_qemu-xilinx-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" 53PREFERRED_VERSION_qemu-xilinx-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
53PREFERRED_VERSION_qemu-xilinx-system-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" 54PREFERRED_VERSION_qemu-xilinx-system-native ?= "${@d.getVarFlag('XILINX_QEMU_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
@@ -55,16 +56,19 @@ PREFERRED_VERSION_qemu-devicetrees ?= "xilinx-${XILINX_RELEASE_VERSION}%"
55 56
56XILINX_ATF_VERSION[v2023.1] = "2.8-xilinx-v2023.1%" 57XILINX_ATF_VERSION[v2023.1] = "2.8-xilinx-v2023.1%"
57XILINX_ATF_VERSION[v2023.2] = "2.8-xilinx-v2023.2%" 58XILINX_ATF_VERSION[v2023.2] = "2.8-xilinx-v2023.2%"
59XILINX_ATF_VERSION[v2024.1] = "2.8-xilinx-v2024.1%"
58PREFERRED_VERSION_arm-trusted-firmware ?= "${@d.getVarFlag('XILINX_ATF_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" 60PREFERRED_VERSION_arm-trusted-firmware ?= "${@d.getVarFlag('XILINX_ATF_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
59 61
60XILINX_UBOOT_VERSION[v2023.1] = "v2023.01-xilinx-v2023.1%" 62XILINX_UBOOT_VERSION[v2023.1] = "v2023.01-xilinx-v2023.1%"
61XILINX_UBOOT_VERSION[v2023.2] = "v2023.01-xilinx-v2023.2%" 63XILINX_UBOOT_VERSION[v2023.2] = "v2023.01-xilinx-v2023.2%"
64XILINX_UBOOT_VERSION[v2024.1] = "v2023.01-xilinx-v2024.1%"
62 65
63PREFERRED_VERSION_u-boot-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" 66PREFERRED_VERSION_u-boot-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
64PREFERRED_VERSION_u-boot-tools-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" 67PREFERRED_VERSION_u-boot-tools-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
65 68
66XILINX_LINUX_VERSION[v2023.1] = "6.1.5-xilinx-v2023.1%" 69XILINX_LINUX_VERSION[v2023.1] = "6.1.5-xilinx-v2023.1%"
67XILINX_LINUX_VERSION[v2023.2] = "6.1.30-xilinx-v2023.2%" 70XILINX_LINUX_VERSION[v2023.2] = "6.1.30-xilinx-v2023.2%"
71XILINX_LINUX_VERSION[v2024.1] = "6.1.30-xilinx-v2024.1%"
68PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" 72PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
69 73
70# Add support to eSDK for gen-machine-conf if it exists 74# Add support to eSDK for gen-machine-conf if it exists