embeddedsw: Sync with meta-xilinx-tools

Change the order of embeddedsw and some of the variables used to allow
bbappending from meta-xilinx-tools

Add Description and Provide from meta-xilinx-tools versions.

Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>

4 files changed, 36 insertions, 18 deletions

diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw.inc
index 79c1a5f4..d7cd3c3f 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw.inc
@@ -1,26 +1,30 @@
 # Automatically determnine the version from the bb file
-SRC_VER ?= "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or 'master'}"
+ESW_VER ?= "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or 'master'}"
 
-LICENSE = "Proprietary"
+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"
+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"
+SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}"
+
+EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}"
+EMBEDDEDSW_SRCURI ?= "${REPO};${EMBEDDEDSW_BRANCHARG}"
+
+LICENSE = "MIT"
 LIC_FILES_CHKSUM[2019.1] = 'e9b6d01d45faccfbf05d8caea53f0a35'
 LIC_FILES_CHKSUM[2019.2] = '39ab6ab638f4d1836ba994ec6852de94'
 LIC_FILES_CHKSUM[2020.1] = '8b565227e1264d677db8f841c2948cba'
 LIC_FILES_CHKSUM[2020.2] = '3a6e22aebf6516f0f74a82e1183f74f8'
 LIC_FILES_CHKSUM[master] = '3a6e22aebf6516f0f74a82e1183f74f8'
-LIC_FILES_CHKSUM = "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('SRC_VER')) or '0'}"
-
-SRCREV[2019.1] = "26c14d9861010a0e3a55c73fb79efdb816eb42ca"
-SRCREV[2019.2] = "e8db5fb118229fdc621e0ec7848641a23bf60998"
-SRCREV[2020.1] = "338150ab3628a1ea6b06e964b16e712b131882dd"
-SRCREV[2020.2] = "2516d5ed8161e16c2813b0e8e4ceac693f23de5c"
-SRCREV ?= "${@d.getVarFlag('SRCREV', d.getVar('SRC_VER')) or '${AUTOREV}'}"
-
-PV = "${SRC_VER}+git${SRCPV}"
-
-SRC_BRANCH[2019.1] = "release-2019.1"
-SRC_BRANCH[2019.2] = "release-2019.2"
-SRC_BRANCH[2020.1] = "release-2020.1"
-SRC_BRANCH[2020.2] = "master-rel-2020.2"
-SRC_BRANCH ?= "${@d.getVarFlag('SRC_BRANCH', d.getVar('SRC_VER')) or '${SRC_VER}'}"
+LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('ESW_VER')) or '0'}"
 
-SRC_URI = "git://github.com/Xilinx/embeddedsw.git;protocol=https;branch=${SRC_BRANCH}"
+SRC_URI = "${EMBEDDEDSW_SRCURI}"
+PV = "${ESW_VER}+git${SRCPV}"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
index 5a77e3de..79d6791c 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
@@ -1,3 +1,8 @@
+DESCRIPTION = "Platform Loader and Manager"
+SUMMARY = "Platform Loader and Manager for Versal devices"
+
+PROVIDES = "virtual/plm"
+
 require embeddedsw.inc
 
 inherit deploy
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
index 584809da..1e1c1e65 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
@@ -1,3 +1,7 @@
+DESCRIPTION = "PMU Firmware"
+
+PROVIDES = "virtual/pmu-firmware"
+
 require embeddedsw.inc
 
 SRC_URI += "file://fix-zynqmp-assert.patch"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
index 344bfca0..f6f7590d 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
@@ -1,3 +1,8 @@
+ESCRIPTION = "PSM Firmware"
+SUMMARY = "PSM firmware for versal devices"
+
+PROVIDES = "virtual/psm-firmware"
+
 require embeddedsw.inc
 
 inherit deploy