From d572dee9ef0d49354288f35016b6477848dcb5f3 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 16 May 2024 16:03:18 -0600 Subject: arm-trusted-firmware: Simplify versioning Move version to use standard recipe PV. Signed-off-by: Mark Hatle --- .../recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc | 4 +--- .../arm-trusted-firmware_2.6-xilinx-v2022.1.bb | 7 +++++++ .../arm-trusted-firmware_2.6-xilinx-v2022.2.bb | 7 +++++++ .../arm-trusted-firmware_2.8-xilinx-v2023.1.bb | 7 +++++++ .../arm-trusted-firmware_2.8-xilinx-v2023.2.bb | 7 +++++++ .../arm-trusted-firmware/arm-trusted-firmware_2022.1.bb | 8 -------- .../arm-trusted-firmware/arm-trusted-firmware_2022.2.bb | 8 -------- .../arm-trusted-firmware/arm-trusted-firmware_2023.1.bb | 8 -------- .../arm-trusted-firmware/arm-trusted-firmware_2023.2.bb | 8 -------- 9 files changed, 29 insertions(+), 35 deletions(-) create mode 100644 meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.6-xilinx-v2022.1.bb create mode 100644 meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.6-xilinx-v2022.2.bb create mode 100644 meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.8-xilinx-v2023.1.bb create mode 100644 meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.8-xilinx-v2023.2.bb delete mode 100644 meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb delete mode 100644 meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.2.bb delete mode 100644 meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb delete mode 100644 meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.2.bb (limited to 'meta-xilinx-core') diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc index 2a66f3c2..df97c3cf 100644 --- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc +++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc @@ -14,9 +14,7 @@ B = "${WORKDIR}/build" SYSROOT_DIRS += "/boot" -ATF_VERSION ?= "2.2" -ATF_VERSION_EXTENSION ?= "-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}" -PV = "${ATF_VERSION}${ATF_VERSION_EXTENSION}+git" +PV .= "+git" BRANCH ?= "" REPO ?= "git://github.com/Xilinx/arm-trusted-firmware.git;protocol=https" diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.6-xilinx-v2022.1.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.6-xilinx-v2022.1.bb new file mode 100644 index 00000000..348ad757 --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.6-xilinx-v2022.1.bb @@ -0,0 +1,7 @@ +SRCREV = "67ca59c67f542322554d78820bf9ddaa736d6a84" +BRANCH = "xlnx_rebase_v2.6" +LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" + + +include arm-trusted-firmware.inc + diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.6-xilinx-v2022.2.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.6-xilinx-v2022.2.bb new file mode 100644 index 00000000..365bbbc5 --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.6-xilinx-v2022.2.bb @@ -0,0 +1,7 @@ +SRCREV = "0897efd45ccad29a3dbab610578c70e3a52b2caa" +BRANCH = "xlnx_rebase_v2.6" +LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" + + +include arm-trusted-firmware.inc + diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.8-xilinx-v2023.1.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.8-xilinx-v2023.1.bb new file mode 100644 index 00000000..0246e2ff --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.8-xilinx-v2023.1.bb @@ -0,0 +1,7 @@ +SRCREV = "c9b71dc96f3f18ca94cad590612aae3224c8c84d" +BRANCH = "xlnx_rebase_v2.8" +LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" + + +include arm-trusted-firmware.inc + diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.8-xilinx-v2023.2.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.8-xilinx-v2023.2.bb new file mode 100644 index 00000000..e160f57c --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.8-xilinx-v2023.2.bb @@ -0,0 +1,7 @@ +SRCREV = "6be857cb66300fb21e3f61308e4197911c8ac30d" +BRANCH = "xlnx_rebase_v2.8" +LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" + + +include arm-trusted-firmware.inc + diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb deleted file mode 100644 index f02bb879..00000000 --- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -ATF_VERSION = "2.6" -SRCREV = "67ca59c67f542322554d78820bf9ddaa736d6a84" -BRANCH = "xlnx_rebase_v2.6" -LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" - - -include arm-trusted-firmware.inc - diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.2.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.2.bb deleted file mode 100644 index 5ef2e6ac..00000000 --- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -ATF_VERSION = "2.6" -SRCREV = "0897efd45ccad29a3dbab610578c70e3a52b2caa" -BRANCH = "xlnx_rebase_v2.6" -LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" - - -include arm-trusted-firmware.inc - diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb deleted file mode 100644 index 2bcbe7d4..00000000 --- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -ATF_VERSION = "2.8" -SRCREV = "c9b71dc96f3f18ca94cad590612aae3224c8c84d" -BRANCH = "xlnx_rebase_v2.8" -LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" - - -include arm-trusted-firmware.inc - diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.2.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.2.bb deleted file mode 100644 index 6ebd6cb5..00000000 --- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2023.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -ATF_VERSION = "2.8" -SRCREV = "6be857cb66300fb21e3f61308e4197911c8ac30d" -BRANCH = "xlnx_rebase_v2.8" -LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" - - -include arm-trusted-firmware.inc - -- cgit v1.2.3-54-g00ecf