From dff58b609ab43d53128e033ffeb0f6dce86d8dc7 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 11 May 2021 10:08:01 -0700 Subject: xlnx-embeddedsw.bbclass: Change the way in-progress overrides are handled Instead of hardcoding the values, we move to a format that is compatible with the system bblcass. Signed-off-by: Mark Hatle cherry-pick: 46f5f35 Signed-off-by: Sai Hari Chandana Kalluri --- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 7 +++++-- meta-xilinx-standalone/conf/embeddedsw.inc | 5 ----- 2 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 meta-xilinx-standalone/conf/embeddedsw.inc 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 @@ # Automatically determnine the version from the bb file ESW_VER ?= "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or 'master'}" -require conf/embeddedsw.inc REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" ESW_BRANCH[2019.1] = "release-2019.1" ESW_BRANCH[2019.2] = "release-2019.2" ESW_BRANCH[2020.1] = "release-2020.1" ESW_BRANCH[2020.2] = "master-rel-2020.2" -ESW_BRANCH[git] = "master" +ESW_BRANCH[2021.1] = "xlnx_rel_v2021.1" +ESW_BRANCH[git] = "xlnx_rel_v2021.1" BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" ESW_REV[2019.1] = "26c14d9861010a0e3a55c73fb79efdb816eb42ca" ESW_REV[2019.2] = "e8db5fb118229fdc621e0ec7848641a23bf60998" ESW_REV[2020.1] = "338150ab3628a1ea6b06e964b16e712b131882dd" ESW_REV[2020.2] = "2516d5ed8161e16c2813b0e8e4ceac693f23de5c" +ESW_REV[2021.1] = "a7bbd50bf1b02154076ebd348d217480b040a256" +ESW_REV[git] = "a7bbd50bf1b02154076ebd348d217480b040a256" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" @@ -25,6 +27,7 @@ LIC_FILES_CHKSUM[release-2019.1] = 'e9b6d01d45faccfbf05d8caea53f0a35' LIC_FILES_CHKSUM[release-2019.2] = '39ab6ab638f4d1836ba994ec6852de94' LIC_FILES_CHKSUM[release-2020.1] = '8b565227e1264d677db8f841c2948cba' LIC_FILES_CHKSUM[master-rel-2020.2] = '3a6e22aebf6516f0f74a82e1183f74f8' +LIC_FILES_CHKSUM[xlnx_rel_v2021.1] = "3a6e22aebf6516f0f74a82e1183f74f8" LIC_FILES_CHKSUM[master] = '3a6e22aebf6516f0f74a82e1183f74f8' LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}" 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 @@ -REPO = "git://github.com/Xilinx/embeddedsw.git;protocol=https" -BRANCH = "xlnx_rel_v2021.1" -SRCREV = "a7bbd50bf1b02154076ebd348d217480b040a256" - -LIC_FILES_CHKSUM="file://license.txt;md5=3a6e22aebf6516f0f74a82e1183f74f8" -- cgit v1.2.3-54-g00ecf