diff options
| -rw-r--r-- | meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 7 | ||||
| -rw-r--r-- | meta-xilinx-standalone/conf/embeddedsw.inc | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index f4213f1f..a4d62b8d 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | |||
| @@ -1,20 +1,22 @@ | |||
| 1 | # Automatically determnine the version from the bb file | 1 | # Automatically determnine the version from the bb file |
| 2 | ESW_VER ?= "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or 'master'}" | 2 | ESW_VER ?= "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or 'master'}" |
| 3 | 3 | ||
| 4 | require conf/embeddedsw.inc | ||
| 5 | REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" | 4 | REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" |
| 6 | 5 | ||
| 7 | ESW_BRANCH[2019.1] = "release-2019.1" | 6 | ESW_BRANCH[2019.1] = "release-2019.1" |
| 8 | ESW_BRANCH[2019.2] = "release-2019.2" | 7 | ESW_BRANCH[2019.2] = "release-2019.2" |
| 9 | ESW_BRANCH[2020.1] = "release-2020.1" | 8 | ESW_BRANCH[2020.1] = "release-2020.1" |
| 10 | ESW_BRANCH[2020.2] = "master-rel-2020.2" | 9 | ESW_BRANCH[2020.2] = "master-rel-2020.2" |
| 11 | ESW_BRANCH[git] = "master" | 10 | ESW_BRANCH[2021.1] = "xlnx_rel_v2021.1" |
| 11 | ESW_BRANCH[git] = "xlnx_rel_v2021.1" | ||
| 12 | BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" | 12 | BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" |
| 13 | 13 | ||
| 14 | ESW_REV[2019.1] = "26c14d9861010a0e3a55c73fb79efdb816eb42ca" | 14 | ESW_REV[2019.1] = "26c14d9861010a0e3a55c73fb79efdb816eb42ca" |
| 15 | ESW_REV[2019.2] = "e8db5fb118229fdc621e0ec7848641a23bf60998" | 15 | ESW_REV[2019.2] = "e8db5fb118229fdc621e0ec7848641a23bf60998" |
| 16 | ESW_REV[2020.1] = "338150ab3628a1ea6b06e964b16e712b131882dd" | 16 | ESW_REV[2020.1] = "338150ab3628a1ea6b06e964b16e712b131882dd" |
| 17 | ESW_REV[2020.2] = "2516d5ed8161e16c2813b0e8e4ceac693f23de5c" | 17 | ESW_REV[2020.2] = "2516d5ed8161e16c2813b0e8e4ceac693f23de5c" |
| 18 | ESW_REV[2021.1] = "a7bbd50bf1b02154076ebd348d217480b040a256" | ||
| 19 | ESW_REV[git] = "a7bbd50bf1b02154076ebd348d217480b040a256" | ||
| 18 | SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" | 20 | SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" |
| 19 | 21 | ||
| 20 | EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" | 22 | EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" |
| @@ -25,6 +27,7 @@ LIC_FILES_CHKSUM[release-2019.1] = 'e9b6d01d45faccfbf05d8caea53f0a35' | |||
| 25 | LIC_FILES_CHKSUM[release-2019.2] = '39ab6ab638f4d1836ba994ec6852de94' | 27 | LIC_FILES_CHKSUM[release-2019.2] = '39ab6ab638f4d1836ba994ec6852de94' |
| 26 | LIC_FILES_CHKSUM[release-2020.1] = '8b565227e1264d677db8f841c2948cba' | 28 | LIC_FILES_CHKSUM[release-2020.1] = '8b565227e1264d677db8f841c2948cba' |
| 27 | LIC_FILES_CHKSUM[master-rel-2020.2] = '3a6e22aebf6516f0f74a82e1183f74f8' | 29 | LIC_FILES_CHKSUM[master-rel-2020.2] = '3a6e22aebf6516f0f74a82e1183f74f8' |
| 30 | LIC_FILES_CHKSUM[xlnx_rel_v2021.1] = "3a6e22aebf6516f0f74a82e1183f74f8" | ||
| 28 | LIC_FILES_CHKSUM[master] = '3a6e22aebf6516f0f74a82e1183f74f8' | 31 | LIC_FILES_CHKSUM[master] = '3a6e22aebf6516f0f74a82e1183f74f8' |
| 29 | LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}" | 32 | LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}" |
| 30 | 33 | ||
diff --git a/meta-xilinx-standalone/conf/embeddedsw.inc b/meta-xilinx-standalone/conf/embeddedsw.inc deleted file mode 100644 index c284f550..00000000 --- a/meta-xilinx-standalone/conf/embeddedsw.inc +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | REPO = "git://github.com/Xilinx/embeddedsw.git;protocol=https" | ||
| 2 | BRANCH = "xlnx_rel_v2021.1" | ||
| 3 | SRCREV = "a7bbd50bf1b02154076ebd348d217480b040a256" | ||
| 4 | |||
| 5 | LIC_FILES_CHKSUM="file://license.txt;md5=3a6e22aebf6516f0f74a82e1183f74f8" | ||
