Skip to contentSkip to conversation

arm-bsp/tf-a-tests: Add recipe to build and install TFTF

PATCH Applied [email protected] 2 participants 4 messages May 11, 2022 – May 16, 2022

lore
Share & tools
lore
#0 lore raw

cover arm-bsp/tf-a-tests: Add recipe to build and install TFTF

From: Vishnu Banavath <[email protected]>

TFTF is TF-A tests that runs at NS-EL2. This is primarily developed to test the TF-A interfaces exposed to NS code.

Vishnu Banavath (1):
arm-bsp/tf-a-tests: Add recipe to build and install TFTF

 .gitlab-ci.yml                                |  2 +-
 ci/tftf.yml                                   |  7 +++
 kas/tftf.yml                                  |  7 +++
 .../conf/machine/include/corstone1000.inc     |  1 -
 .../tf-a-tests_2.6.bbappend                   |  3 ++
 .../trusted-firmware-a-corstone1000.inc       |  2 +-
 .../trusted-firmware-a/tf-a-tests_2.6.bb      | 53 +++++++++++++++++++
 .../trusted-firmware-a/trusted-firmware-a.inc |  4 ++
 8 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 ci/tftf.yml
 create mode 100644 kas/tftf.yml
 create mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.6.bbappend
 create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.6.bb
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 arm-bsp/tf-a-tests: Add recipe to build and install TFTF

From: Vishnu Banavath <[email protected]>

TFTF is TF-A tests that runs at NS-EL2. This is primarily developed to test the TF-A interfaces exposed to NS code.

---
 .gitlab-ci.yml                                |  2 +-
 ci/tftf.yml                                   |  7 +++
 kas/tftf.yml                                  |  7 +++
 .../conf/machine/include/corstone1000.inc     |  1 -
 .../tf-a-tests_2.6.bbappend                   |  3 ++
 .../trusted-firmware-a-corstone1000.inc       |  2 +-
 .../trusted-firmware-a/tf-a-tests_2.6.bb      | 53 +++++++++++++++++++
 .../trusted-firmware-a/trusted-firmware-a.inc |  4 ++
 8 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 ci/tftf.yml
 create mode 100644 kas/tftf.yml
 create mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.6.bbappend
 create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.6.bb
.gitlab-ci.yml +1 -1
index 40e00fc0..a6804215 100644
@@ -82,7 +82,7 @@ corstone1000-fvp:
   extends: .build
   parallel:
     matrix:
-      - TESTING: testimage
+      - TESTING: [testimage,tftf]
   tags:
     - x86_64
 
ci/tftf.yml new file +7 -0
new file mode 100644
index 00000000..6e42d9c6
@@ -0,0 +1,7 @@
+header:
+  version: 9
+
+local_conf_header:
+  tftf: |
+    TFA_UBOOT = "0"
+    TFTF_TESTS = "1"
kas/tftf.yml new file +7 -0
new file mode 100644
index 00000000..6e42d9c6
@@ -0,0 +1,7 @@
+header:
+  version: 9
+
+local_conf_header:
+  tftf: |
+    TFA_UBOOT = "0"
+    TFTF_TESTS = "1"
meta-arm-bsp/conf/machine/include/corstone1000.inc +0 -1
index d38773a3..380ed30f 100644
@@ -63,4 +63,3 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0"
 WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}"
 
 WKS_FILE ?= "corstone1000-image.corstone1000.wks"
-
meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.6.bbappend new file +3 -0
new file mode 100644
index 00000000..ff22ff12
@@ -0,0 +1,3 @@
+# Machine specific TFAs
+
+COMPATIBLE_MACHINE:corstone1000 = "corstone1000"
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc +1 -1
index e59d31a7..ac4a412c 100644
@@ -11,7 +11,7 @@ SRC_URI:remove = " \
      "  
 
 TFA_DEBUG = "1"
-TFA_UBOOT = "1"
+TFA_UBOOT ?= "1"
 TFA_MBEDTLS = "1"
 TFA_BUILD_TARGET = "bl2 bl31 fip"
 
meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.6.bb new file +53 -0

53 lines not on this page · raw message

meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +4 -0
index 9f588a71..2e3b50c5 100644
@@ -135,6 +135,10 @@ EXTRA_OEMAKE += "${@bb.utils.contains('TFA_UBOOT', '1', 'BL33=${DEPLOY_DIR_IMAGE
 DEPENDS += " ${@bb.utils.contains('TFA_UEFI', '1', 'edk2-firmware', '', d)}"
 EXTRA_OEMAKE += "${@bb.utils.contains('TFA_UEFI', '1', 'BL33=${RECIPE_SYSROOT}/firmware/uefi.bin', '', d)}"
 
+# TFTF test support
+DEPENDS += " ${@bb.utils.contains('TFTF_TESTS', '1', 'tf-a-tests', '', d)}"
+EXTRA_OEMAKE += "${@bb.utils.contains('TFTF_TESTS', '1', 'BL33=${RECIPE_SYSROOT}/firmware/tftf.bin', '',d)}"
+
 # Hafnium support
 SEL2_SPMC = "${@'${TFA_SPMD_SPM_AT_SEL2}' if d.getVar('TFA_SPD', True) == 'spmd' else ''}"
 
Signature · 1 line
2.17.1
Applied
#2 lore raw
In reply to [email protected]
Quoted 6 lines · On Wed, 11 May 2022 14:52:30 +0100, [email protected] wrote:

TFTF is TF-A tests that runs at NS-EL2. This is primarily developed to test the TF-A interfaces exposed to NS code.

Vishnu Banavath (1):
arm-bsp/tf-a-tests: Add recipe to build and install TFTF

Quoted 13 lines
 .gitlab-ci.yml                                |  2 +-
 ci/tftf.yml                                   |  7 +++
 kas/tftf.yml                                  |  7 +++
 .../conf/machine/include/corstone1000.inc     |  1 -
 .../tf-a-tests_2.6.bbappend                   |  3 ++
 .../trusted-firmware-a-corstone1000.inc       |  2 +-
 .../trusted-firmware-a/tf-a-tests_2.6.bb      | 53 +++++++++++++++++++
 .../trusted-firmware-a/trusted-firmware-a.inc |  4 ++
 8 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 ci/tftf.yml
 create mode 100644 kas/tftf.yml
 create mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.6.bbappend
 create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.6.bb

Applied, thanks!

[1/1] arm-bsp/tf-a-tests: Add recipe to build and install TFTF

      commit: f68fa49bcae00f9aa25473ef878ef8a72e2dd41e

Best regards,

Signature · 1 line
Jon Mason <[email protected]>
Applied
#3 lore raw
In reply to [email protected]
Quoted 6 lines · On Wed, 11 May 2022 14:52:30 +0100, [email protected] wrote:

TFTF is TF-A tests that runs at NS-EL2. This is primarily developed to test the TF-A interfaces exposed to NS code.

Vishnu Banavath (1):
arm-bsp/tf-a-tests: Add recipe to build and install TFTF

Quoted 13 lines
 .gitlab-ci.yml                                |  2 +-
 ci/tftf.yml                                   |  7 +++
 kas/tftf.yml                                  |  7 +++
 .../conf/machine/include/corstone1000.inc     |  1 -
 .../tf-a-tests_2.6.bbappend                   |  3 ++
 .../trusted-firmware-a-corstone1000.inc       |  2 +-
 .../trusted-firmware-a/tf-a-tests_2.6.bb      | 53 +++++++++++++++++++
 .../trusted-firmware-a/trusted-firmware-a.inc |  4 ++
 8 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 ci/tftf.yml
 create mode 100644 kas/tftf.yml
 create mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.6.bbappend
 create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.6.bb

Applied, thanks!

[1/1] arm-bsp/tf-a-tests: Add recipe to build and install TFTF

      commit: 43224b60b7360925b7c3b2eb825189a20e58d3ec

Best regards,

Signature · 1 line
Jon Mason <[email protected]>