From 2b71a5526730d915106405a71a7bcf515c68fbb1 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 26 Feb 2021 08:51:01 -0800 Subject: Adjust standalone embeddedsw so it can be bbappended by meta-xilinx-tools Signed-off-by: Mark Hatle --- .../classes/xlnx-embeddedsw.bbclass | 31 ++++++++++++++++++++ .../recipes-bsp/embeddedsw/embeddedsw.inc | 33 ---------------------- .../recipes-bsp/embeddedsw/plm-firmware.inc | 4 +-- .../recipes-bsp/embeddedsw/plm-firmware_2020.2.bb | 2 ++ .../recipes-bsp/embeddedsw/plm-firmware_git.bb | 2 ++ .../recipes-bsp/embeddedsw/pmu-firmware.inc | 4 +-- .../recipes-bsp/embeddedsw/pmu-firmware_2020.1.bb | 2 ++ .../recipes-bsp/embeddedsw/pmu-firmware_2020.2.bb | 2 ++ .../recipes-bsp/embeddedsw/pmu-firmware_git.bb | 2 ++ .../recipes-bsp/embeddedsw/psm-firmware.inc | 4 +-- .../recipes-bsp/embeddedsw/psm-firmware_2020.2.bb | 2 ++ .../recipes-bsp/embeddedsw/psm-firmware_git.bb | 2 ++ 12 files changed, 48 insertions(+), 42 deletions(-) create mode 100644 meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass delete mode 100644 meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw.inc diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass new file mode 100644 index 00000000..203cd264 --- /dev/null +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -0,0 +1,31 @@ +# Automatically determnine the version from the bb file +ESW_VER ?= "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or 'master'}" + +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" +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[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[master] = '3a6e22aebf6516f0f74a82e1183f74f8' +LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}" + +SRC_URI = "${EMBEDDEDSW_SRCURI}" +PV = "${ESW_VER}+git${SRCPV}" diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw.inc deleted file mode 100644 index 008dfef7..00000000 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/embeddedsw.inc +++ /dev/null @@ -1,33 +0,0 @@ -# Automatically determnine the version from the bb file -ESW_VER ?= "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or 'master'}" - -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" -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[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[master] = '3a6e22aebf6516f0f74a82e1183f74f8' -LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}" - -SRC_URI = "${EMBEDDEDSW_SRCURI}" -PV = "${ESW_VER}+git${SRCPV}" - -FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc index 8ff96b64..49e6e452 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc @@ -3,9 +3,7 @@ SUMMARY = "Platform Loader and Manager for Versal devices" PROVIDES = "virtual/plm" -require embeddedsw.inc - -inherit deploy +inherit xlnx-embeddedsw deploy COMPATIBLE_HOST = "microblaze.*-elf" COMPATIBLE_MACHINE = "microblaze-plm" diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2020.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2020.2.bb index b8a920ae..a1b4aa00 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2020.2.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_2020.2.bb @@ -1,5 +1,7 @@ require plm-firmware.inc +FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" + SRC_URI += " \ file://0001-zynqmp_pmufw-Fix-reset-ops-for-assert.patch \ file://0001-zynqmp_pmufw-Correct-structure-header-of-PmResetOps.patch \ diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_git.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_git.bb index b625b332..ccabf9dc 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_git.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_git.bb @@ -3,6 +3,8 @@ DEFAULT_PREFERENCE = "-1" require plm-firmware.inc +FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" + SRC_URI += " \ file://0001-zynqmp_pmufw-Fix-reset-ops-for-assert.patch \ file://0001-zynqmp_pmufw-Correct-structure-header-of-PmResetOps.patch \ diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc index dc0e1c82..f77976e0 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc @@ -2,9 +2,7 @@ DESCRIPTION = "PMU Firmware" PROVIDES = "virtual/pmu-firmware" -require embeddedsw.inc - -inherit deploy +inherit xlnx-embeddedsw deploy COMPATIBLE_HOST = "microblaze.*-elf" COMPATIBLE_MACHINE = "microblaze-pmu" diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2020.1.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2020.1.bb index 047047bc..6b90f496 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2020.1.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2020.1.bb @@ -1,5 +1,7 @@ require pmu-firmware.inc +FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" + SRC_URI += " \ file://0001-zynqmp_pmufw-Fix-reset-ops-for-assert.patch \ file://0001-zynqmp_pmufw-Correct-structure-header-of-PmResetOps.patch \ diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2020.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2020.2.bb index 12fc5c76..81eaf1ae 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2020.2.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_2020.2.bb @@ -1,5 +1,7 @@ require pmu-firmware.inc +FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" + SRC_URI += " \ file://0001-zynqmp_pmufw-Fix-reset-ops-for-assert.patch \ file://0001-zynqmp_pmufw-Correct-structure-header-of-PmResetOps.patch \ diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_git.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_git.bb index 17ce7693..fe4dcf5f 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_git.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_git.bb @@ -3,6 +3,8 @@ DEFAULT_PREFERENCE = "-1" require pmu-firmware.inc +FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" + SRC_URI += " \ file://0001-zynqmp_pmufw-Fix-reset-ops-for-assert.patch \ file://0001-zynqmp_pmufw-Correct-structure-header-of-PmResetOps.patch \ diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc index 66754b08..25db5bf4 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc @@ -3,9 +3,7 @@ SUMMARY = "PSM firmware for versal devices" PROVIDES = "virtual/psm-firmware" -require embeddedsw.inc - -inherit deploy +inherit xlnx-embeddedsw deploy COMPATIBLE_HOST = "microblaze.*-elf" COMPATIBLE_MACHINE = "microblaze-psm" diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2020.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2020.2.bb index 39353fdf..9603e53f 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2020.2.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_2020.2.bb @@ -1,5 +1,7 @@ require psm-firmware.inc +FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" + SRC_URI += " \ file://0001-zynqmp_pmufw-Fix-reset-ops-for-assert.patch \ file://0001-zynqmp_pmufw-Correct-structure-header-of-PmResetOps.patch \ diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_git.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_git.bb index 6d34e723..6dd322b1 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_git.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_git.bb @@ -3,6 +3,8 @@ DEFAULT_PREFERENCE = "-1" require psm-firmware.inc +FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" + SRC_URI += " \ file://0001-zynqmp_pmufw-Fix-reset-ops-for-assert.patch \ file://0001-zynqmp_pmufw-Correct-structure-header-of-PmResetOps.patch \ -- cgit v1.2.3-54-g00ecf