summaryrefslogtreecommitdiffstats
path: root/meta-xilinx-standalone
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@amd.com>2024-06-28 16:43:16 -0500
committerMark Hatle <mark.hatle@amd.com>2024-06-28 16:43:16 -0500
commit0003649185351822c6614ae85e3eb5e6a0793203 (patch)
treefc322d845b429c797c66721fe04ba3cd1f215d54 /meta-xilinx-standalone
parent80087cadbe63d676a65bf35a63fd96e877754975 (diff)
parente7ec92b7a4a0e6bf5e740f46b3c7b8c9c4426f4f (diff)
downloadmeta-xilinx-0003649185351822c6614ae85e3eb5e6a0793203.tar.gz
Merge remote-tracking branch 'xilinx/2024.1_2024.2' into 2024.2
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-standalone')
-rw-r--r--meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
index 1eb225b4..3d02f1b3 100644
--- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
+++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
@@ -19,7 +19,7 @@ ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2"
19ESW_REV[2023.1] = "af784f742dad0ca6e69e05baf8de51152c396b9a" 19ESW_REV[2023.1] = "af784f742dad0ca6e69e05baf8de51152c396b9a"
20ESW_REV[2023.2] = "e847e1935dca630615e5f7dc694365a44b89699c" 20ESW_REV[2023.2] = "e847e1935dca630615e5f7dc694365a44b89699c"
21ESW_REV[2024.1] = "b173d246826f662b9a98215d8f39e93d39d699b4" 21ESW_REV[2024.1] = "b173d246826f662b9a98215d8f39e93d39d699b4"
22ESW_REV[2024.2] = "344959f93c0378805a07d9789b498f31c82b1811" 22ESW_REV[2024.2] = "1e87271e432974813965355d58f14ce1869fb1e8"
23SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or 'INVALID'}" 23SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or 'INVALID'}"
24 24
25EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" 25EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}"