Skip to contentSkip to conversation

arm-bsp/a5ds: explicitly select trusted-firmware-a 2.3

PATCH New Ross Burton 1 participant 4 messages Nov 19, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 arm-bsp/a5ds: explicitly select trusted-firmware-a 2.3

This BSP doesn't select a version of trusted-firmware-a, for clarity and allow smooth upgrades explictly select 2.3.

Change-Id I4e7ca6ff8322e22406040ba2f220d36e1bde4cae
---
 meta-arm-bsp/conf/machine/a5ds.conf | 2 ++
 1 file changed, 2 insertions(+)
meta-arm-bsp/conf/machine/a5ds.conf +2 -0
index a0fe029..8a4b36d 100644
@@ -11,6 +11,8 @@ PREFERRED_VERSION_linux-yocto ?= "5.3%"
 KBUILD_DEFCONFIG = "multi_v7_defconfig"
 KCONFIG_MODE = "--alldefconfig"
 
+PREFERRED_VERSION_trusted-firmware-a ?= "2.3%"
+
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
 
 SERIAL_CONSOLES = "115200;ttyAMA0"
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/4 arm-bsp/fvp-common: explicitly select trusted-firmware-a 2.3

These BSPs don't select a version of trusted-firmware-a, for clarity and allow smooth upgrades explictly select 2.3.

Change-Id Ieea7d075d709e2006ebf217d802f3eeecfb9a281
---
 meta-arm-bsp/conf/machine/fvp-common.inc | 1 +
 1 file changed, 1 insertion(+)
meta-arm-bsp/conf/machine/fvp-common.inc +1 -0
index ad08c0e..841760e 100644
@@ -32,6 +32,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "5.4%"
 
 PREFERRED_VERSION_u-boot ?= "2020.07"
+PREFERRED_VERSION_trusted-firmware-a ?= "2.3%"
 
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
 
Signature · 1 line
2.25.1
#2 lore raw

PATCH 3/4 arm/trusted-firmware-a: consolidate SRC_URI and S

In reply to Ross Burton

All the recipes use the same value for SRC_URI and S, so consolidate them into the include file.

Change-Id Ieda6b0104e163ce46190e9fc5756a264f7198f25
---
 .../recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc     | 3 +++
 .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_1.5.bb  | 4 ----
 .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb  | 4 ----
 .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb  | 4 ----
 .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb  | 4 ----
 .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb  | 4 ----
 6 files changed, 3 insertions(+), 20 deletions(-)
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +3 -0
index f7439c1..1e483a7 100644
@@ -7,6 +7,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit deploy
 
+SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa"
+
 COMPATIBLE_MACHINE ?= "invalid"
 COMPATIBLE_MACHINE_qemuarm64 ?= "qemuarm64"
 
@@ -27,6 +29,7 @@ TFA_SPD_aarch64_qemuall ?= "opteed"
 # Build for debug (set TFA_DEBUG to 1 to activate)
 TFA_DEBUG ?= "0"
 
+S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 
 # mbed TLS support (set TFA_MBEDTLS to 1 to activate)
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_1.5.bb +0 -4
index 2e41e90..56d3507 100644
@@ -4,16 +4,12 @@
 
 require trusted-firmware-a.inc
 
-SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa"
-
 # Use TF-A for version
 SRCREV_FORMAT = "tfa"
 
 # TF-A v1.5
 SRCREV_tfa = "ed8112606c54d85781fc8429160883d6310ece32"
 
-S = "${WORKDIR}/git"
-
 LIC_FILES_CHKSUM += "file://license.rst;md5=e927e02bca647e14efd87e9e914b2443"
 
 #
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0 -4
index 96df5c6..44d6d6f 100644
@@ -4,16 +4,12 @@
 
 require trusted-firmware-a.inc
 
-SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa"
-
 # Use TF-A for version
 SRCREV_FORMAT = "tfa"
 
 # TF-A v2.1
 SRCREV_tfa = "e1286bdb968ee74fc52f96cf303a4218e1ae2950"
 
-S = "${WORKDIR}/git"
-
 LIC_FILES_CHKSUM += "file://license.rst;md5=c709b197e22b81ede21109dbffd5f363"
 
 #
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb +0 -4
index 58e6c8e..4e8882c 100644
@@ -4,16 +4,12 @@
 
 require trusted-firmware-a.inc
 
-SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa"
-
 # Use TF-A for version
 SRCREV_FORMAT = "tfa"
 
 # TF-A v2.2
 SRCREV_tfa = "7192b956bde11652a835eee0724dca0e403fee90"
 
-S = "${WORKDIR}/git"
-
 LIC_FILES_CHKSUM += "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89"
 
 #
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb +0 -4
index d333854..6c8308a 100644
@@ -4,16 +4,12 @@
 
 require trusted-firmware-a.inc
 
-SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa"
-
 # Use TF-A for version
 SRCREV_FORMAT = "tfa"
 
 # TF-A v2.3
 SRCREV_tfa = "ecd27ad85f1eba29f6bf92c39dc002c85b07dad5"
 
-S = "${WORKDIR}/git"
-
 LIC_FILES_CHKSUM += "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89"
 
 #
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +0 -4
index 6adc00b..8dab35f 100644
@@ -8,13 +8,9 @@ DEFAULT_PREFERENCE = "-1"
 
 require trusted-firmware-a.inc
 
-SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa"
-
 # Use TF-A for version
 SRCREV_FORMAT = "tfa"
 
-S = "${WORKDIR}/git"
-
 LIC_FILES_CHKSUM += "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89"
 
 #
Signature · 1 line
2.25.1
#3 lore raw

PATCH 4/4 arm/trusted-firmare-a: add version 2.4

In reply to Ross Burton
Change-Id Ia31b459a497bb5029d18a202b8add5edc7fd6872
---
 .../trusted-firmware-a/trusted-firmware-a_2.4.bb  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb new file +15 -0
new file mode 100644
index 0000000..f23132a
@@ -0,0 +1,15 @@
+require trusted-firmware-a.inc
+
+# Use TF-A for version
+SRCREV_FORMAT = "tfa"
+
+# TF-A v2.4
+SRCREV_tfa = "e2c509a39c6cc4dda8734e6509cdbe6e3603cdfc"
+
+LIC_FILES_CHKSUM += "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89"
+
+# mbed TLS v2.24.0
+SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=master"
+SRCREV_mbedtls = "523f0554b6cdc7ace5d360885c3f5bbcc73ec0e8"
+
+LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
Signature · 1 line
2.25.1