diff options
| author | Mark Hatle <mark.hatle@amd.com> | 2024-03-27 14:18:33 -0600 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@amd.com> | 2024-03-27 14:18:33 -0600 |
| commit | d8a5293244c173bfd1faef83b9c52e6d3d27e9a5 (patch) | |
| tree | e7a290c1460650e7368305cb00681f1f5246d3fa /meta-xilinx-standalone | |
| parent | 14af015057a31eb9e84c5b7c1cb21ee7cfcc7db1 (diff) | |
| parent | 3a12cf3c927ac016b9dc288d441e68e504d74830 (diff) | |
| download | meta-xilinx-d8a5293244c173bfd1faef83b9c52e6d3d27e9a5.tar.gz | |
Merge remote-tracking branch 'xilinx/rel-v2024.1' into master-next
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-standalone')
| -rw-r--r-- | meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 1618bbcd..089888fe 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | |||
| 1 | # Automatically determnine the version from the bb file | 2 | # Automatically determnine the version from the bb file |
| 2 | ESW_VER ?= "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or 'master'}" | 3 | ESW_VER ?= "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or 'master'}" |
| 3 | 4 | ||
| @@ -15,8 +16,8 @@ ESW_REV[git] = "${AUTOREV}" | |||
| 15 | ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" | 16 | ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" |
| 16 | ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" | 17 | ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" |
| 17 | ESW_REV[2023.1] = "af784f742dad0ca6e69e05baf8de51152c396b9a" | 18 | ESW_REV[2023.1] = "af784f742dad0ca6e69e05baf8de51152c396b9a" |
| 18 | ESW_REV[2023.2] = "73f0904e41cc109f18bb19a5329d0e5a66af2434" | 19 | ESW_REV[2023.2] = "e847e1935dca630615e5f7dc694365a44b89699c" |
| 19 | ESW_REV[2024.1] = "e367a6b8df2a30b12e5c88157afd98322a06c8a6" | 20 | ESW_REV[2024.1] = "bd55a53c2e0bd9d27cd20a2660d14b0024aa8bb4" |
| 20 | SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or 'INVALID'}" | 21 | SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or 'INVALID'}" |
| 21 | 22 | ||
| 22 | EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" | 23 | EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" |