From 0ee98f6b0a456b3d6450ab5b677592d4d01f24e8 Mon Sep 17 00:00:00 2001 From: Frieder Schrempf <frieder.schrempf@kontron.de> Date: Wed, 21 Dec 2022 12:52:26 +0100 Subject: [PATCH] meta-ktn-stm32mp: trusted-firmware-a: Add legacy 2.4 recipe At the moment we don't want to upgrade to the 2.6 version from the OpenST Linux Kirkstone release. Therefore let's add a recipe for the legacy version from Dunfell for now. --- .../machine/include/stm32mp-t1000-common.inc | 4 +- .../tf-a-stm32mp-ktn_2.4.bb | 52 +++++++++++++++++++ .../tf-a-stm32mp_2.4.bbappend | 10 ---- 3 files changed, 54 insertions(+), 12 deletions(-) create mode 100644 layers/meta-ktn-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp-ktn_2.4.bb delete mode 100644 layers/meta-ktn-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.4.bbappend diff --git a/layers/meta-ktn-stm32mp/conf/machine/include/stm32mp-t1000-common.inc b/layers/meta-ktn-stm32mp/conf/machine/include/stm32mp-t1000-common.inc index 678e75f6..364176bb 100644 --- a/layers/meta-ktn-stm32mp/conf/machine/include/stm32mp-t1000-common.inc +++ b/layers/meta-ktn-stm32mp/conf/machine/include/stm32mp-t1000-common.inc @@ -10,7 +10,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-stm32mp" #PREFERRED_VERSION_linux-stm32mp ?= "5.10" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-stm32mp" #PREFERRED_VERSION_u-boot-stm32mp ?= "2020.10" -PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "tf-a-stm32mp" +PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "tf-a-stm32mp-ktn" PREFERRED_VERSION_trusted-firmware-a ?= "2.4" include conf/machine/include/st-machine-common-stm32mp.inc @@ -100,7 +100,7 @@ SERIAL_CONSOLES = "115200;ttySTM0" SERIAL_CONSOLE = "115200 ttySTM0" # What should be built alongside this image -EXTRA_IMAGEDEPENDS += "tf-a-stm32mp" +EXTRA_IMAGEDEPENDS += "tf-a-stm32mp-ktn" EXTRA_IMAGEDEPENDS += "u-boot-stm32mp" # Chip architecture diff --git a/layers/meta-ktn-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp-ktn_2.4.bb b/layers/meta-ktn-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp-ktn_2.4.bb new file mode 100644 index 00000000..66931587 --- /dev/null +++ b/layers/meta-ktn-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp-ktn_2.4.bb @@ -0,0 +1,52 @@ +require recipes-bsp/trusted-firmware-a/tf-a-stm32mp-common.inc +include recipes-bsp/trusted-firmware-a/tf-a-stm32mp.inc + +SUMMARY = "Trusted Firmware-A for STM32MP1" +SECTION = "bootloaders" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" + +PROVIDES += "virtual/trusted-firmware-a" + +SRCREV = "6bbbf4489d8c0935da9b7363dd0059703c590e2f" +SRC_URI = "git://${KTN_GIT_SERVER}/sw/misc/arm-trusted-firmware.git;protocol=https;branch=develop-${TF_A_VERSION}-stm32mp-ktn" + +TF_A_VERSION = "v2.4" +TF_A_SUBVERSION = "stm32mp" +TF_A_RELEASE = "r2.1-ktn" +PV = "${TF_A_VERSION}-${TF_A_SUBVERSION}-${TF_A_RELEASE}" + +ARCHIVER_ST_BRANCH = "${TF_A_VERSION}-${TF_A_SUBVERSION}" +ARCHIVER_ST_REVISION = "${PV}" +ARCHIVER_COMMUNITY_BRANCH = "master" +ARCHIVER_COMMUNITY_REVISION = "${TF_A_VERSION}" + +S = "${WORKDIR}/git" + +# Configure settings +TFA_PLATFORM = "stm32mp1" +TFA_ARM_MAJOR = "7" +TFA_ARM_ARCH = "aarch32" + +# Enable the wrapper for debug +TF_A_ENABLE_DEBUG_WRAPPER ?= "1" + +# --------------------------------- +# Configure archiver use +# --------------------------------- +include ${@oe.utils.ifelse(d.getVar('ST_ARCHIVER_ENABLE') == '1', 'tf-a-stm32mp-archiver.inc','')} + +# --------------------------------- +# Configure devupstream class usage +# --------------------------------- +BBCLASSEXTEND = "devupstream:target" + +SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/arm-trusted-firmware.git;protocol=https;branch=${ARCHIVER_ST_BRANCH}" +SRCREV_class-devupstream = "a47302b7b05a9c1e27f62b08fe8f66ca422ef174" + +# --------------------------------- +# Configure default preference to manage dynamic selection between tarball and github +# --------------------------------- +STM32MP_SOURCE_SELECTION ?= "tarball" + +DEFAULT_PREFERENCE = "${@bb.utils.contains('STM32MP_SOURCE_SELECTION', 'github', '-1', '1', d)}" diff --git a/layers/meta-ktn-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.4.bbappend b/layers/meta-ktn-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.4.bbappend deleted file mode 100644 index b36dc379..00000000 --- a/layers/meta-ktn-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.4.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -# OpenST v2.4-stm32mp-r2.1 + KTN Patches -# Based on OpenST 3.1.1 (22-06-08) -# -> trusted-firmaware-a 2.4 + Patches - -TF_A_VERSION = "v2.4" -TF_A_SUBVERSION = "stm32mp" -TF_A_RELEASE = "r2.1-ktn" - -SRCREV = "b64160cf32352fbdfd91b7f35340d33e781f805d" -SRC_URI = "git://${KTN_GIT_SERVER}/sw/misc/arm-trusted-firmware.git;protocol=https;branch=develop-${TF_A_VERSION}-stm32mp-ktn" -- GitLab