Add recipes for TF-A versions 2.2 and 2.3
PATCH 1/1 Add recipes for TF-A versions 2.2 and 2.3
Add basic recipes for TF-A versions 2.2 and 2.3. Also, rearrange fields in the various TF-A recipes to make them uniform and move the do_compile_prepend to the inc file.
--- meta-arm-bsp/conf/machine/juno.conf | 1 + .../trusted-firmware-a/trusted-firmware-a.inc | 13 ++++++- .../trusted-firmware-a_2.1.bb | 20 ++-------- .../trusted-firmware-a_2.2.bb | 38 +++++++++++++++++++ .../trusted-firmware-a_2.3.bb | 38 +++++++++++++++++++ .../trusted-firmware-a_git.bb | 29 ++++++-------- 6 files changed, 103 insertions(+), 36 deletions(-) create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
meta-arm-bsp/conf/machine/juno.conf +1 -0
@@ -20,6 +20,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0" # Use kernel provided by linaro (Contains support for SCMi or HDMI) PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-arm" PREFERRED_VERSION_linux-linaro-arm ?= "4.19%" +PREFERRED_VERSION_trusted-firmware-a ?= "2.1%" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot firmware-image-juno"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +12 -1
@@ -81,8 +81,19 @@ DEPENDS += " ${@bb.utils.contains('TFA_UBOOT', '1', 'u-boot', '', d)}" do_compile[depends] += " ${@bb.utils.contains('TFA_UBOOT', '1', 'u-boot:do_deploy', '', d)}" EXTRA_OEMAKE += "${@bb.utils.contains('TFA_UBOOT', '1', ' BL33=${DEPLOY_DIR_IMAGE}/u-boot.bin', '',d)}" - +# The following hack is needed to fit properly in yocto build environment +# TFA is forcing the host compiler and its flags in the Makefile using := +# assignment for GCC and CFLAGS. +# To properly use the native toolchain of yocto and the right libraries we need +# to pass the proper flags to gcc. This is achieved here by creating a gcc +# script to force passing to gcc the right CFLAGS and LDFLAGS do_compile() { + # Create an host gcc build parser to ensure the proper include path is used + mkdir -p bin + echo "#!/usr/bin/env bash" > bin/gcc + echo "$(which ${BUILD_CC}) ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \$@" >> bin/gcc + chmod a+x bin/gcc + export PATH="$PWD/bin:$PATH" oe_runmake ${TFA_BUILD_TARGET} }
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +3 -17
@@ -1,6 +1,9 @@ # # Trusted firmware-A 2.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
@@ -33,20 +36,3 @@ LIC_FILES_CHKSUM_MBEDTLS += " \ SRC_URI[mbedtls.md5sum] = "37cdec398ae9ebdd4640df74af893c95" SRC_URI[mbedtls.sha256sum] = "a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4" - -require trusted-firmware-a.inc - -# The following hack is needed to fit properly in yocto build environment -# TFA is forcing the host compiler and its flags in the Makefile using := -# assignment for GCC and CFLAGS. -# To properly use the native toolchain of yocto and the right libraries we need -# to pass the proper flags to gcc. This is achieved here by creating a gcc -# script to force passing to gcc the right CFLAGS and LDFLAGS -do_compile_prepend() { - #Create an host gcc build parser to ensure the proper include path is used - mkdir -p bin - echo "#!/usr/bin/env bash" > bin/gcc - echo "$(which ${BUILD_CC}) ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \$@" >> bin/gcc - chmod a+x bin/gcc - export PATH="$PWD/bin:$PATH" -}
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb new file +38 -0
@@ -0,0 +1,38 @@ +# +# Trusted firmware-A 2.2 +# + +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" + +SRC_URI[tfa.md5sum] = "75c8f4958fb493d9bd7a8e5a9636ec18" +SRC_URI[tfa.sha256sum] = "7c4c00a4f28d3cfbb235fd1a1fb28c4d2fc1d657c9301686e7d8824ef575d059" + +# +# mbed TLS source +# Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1 +# + +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls" + +# mbed TLS v2.16.2 +SRCREV_mbedtls = "d81c11b8ab61fd5b2da8133aa73c5fe33a0633eb" + +LIC_FILES_CHKSUM_MBEDTLS += " \ + file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ + " + +SRC_URI[mbedtls.md5sum] = "37cdec398ae9ebdd4640df74af893c95" +SRC_URI[mbedtls.sha256sum] = "a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb new file +38 -0
@@ -0,0 +1,38 @@ +# +# Trusted firmware-A 2.3 +# + +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" + +SRC_URI[tfa.md5sum] = "75c8f4958fb493d9bd7a8e5a9636ec18" +SRC_URI[tfa.sha256sum] = "7c4c00a4f28d3cfbb235fd1a1fb28c4d2fc1d657c9301686e7d8824ef575d059" + +# +# mbed TLS source +# Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1 +# + +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls" + +# mbed TLS v2.18.1 +SRCREV_mbedtls = "ca933c7e0c9e84738b168b6b0feb89af4183a60a" + +LIC_FILES_CHKSUM_MBEDTLS += " \ + file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ + " + +SRC_URI[mbedtls.md5sum] = "37cdec398ae9ebdd4640df74af893c95" +SRC_URI[mbedtls.sha256sum] = "a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +11 -18
@@ -9,30 +9,23 @@ 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" -LIC_FILES_CHKSUM ?= "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89" +S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM = "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89" + +# # mbed TLS source # Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1 +# + SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls" -LIC_FILES_CHKSUM_MBEDTLS ?= " \ + +LIC_FILES_CHKSUM_MBEDTLS += " \ file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ " -S = "${WORKDIR}/git" - -# The following hack is needed to fit properly in yocto build environment -# TFA is forcing the host compiler and its flags in the Makefile using := -# assignment for GCC and CFLAGS. -# To properly use the native toolchain of yocto and the right libraries we need -# to pass the proper flags to gcc. This is achieved here by creating a gcc -# script to force passing to gcc the right CFLAGS and LDFLAGS -do_compile_prepend() { - # Create an host gcc build parser to ensure the proper include path is used - mkdir -p bin - echo "#!/usr/bin/env bash" > bin/gcc - echo "$(which ${BUILD_CC}) ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \$@" >> bin/gcc - chmod a+x bin/gcc - export PATH="$PWD/bin:$PATH" -}
Signature · 1 line
2.17.1
Quoted 6 lines · Jon Mason
Add basic recipes for TF-A versions 2.2 and 2.3. Also, rearrange fields in the various TF-A recipes to make them uniform and move the
do_compile_prependto the inc file.Change-Id I85e4ac7bdc44ed85449e40fd2c94d73bf3e7d9e8Signed-off-by Jon Mason <[email protected]>
Quoted 7 lines
--- meta-arm-bsp/conf/machine/juno.conf | 1 + .../trusted-firmware-a/trusted-firmware-a.inc | 13 ++++++- .../trusted-firmware-a_2.1.bb | 20 ++-------- .../trusted-firmware-a_2.2.bb | 38 +++++++++++++++++++ .../trusted-firmware-a_2.3.bb | 38 +++++++++++++++++++ .../trusted-firmware-a_git.bb | 29 ++++++--------
Any point in keeping git, 2.1, 2.2 and 2.3 around? Can we simplify it into one version?
Quoted 215 lines
6 files changed, 103 insertions(+), 36 deletions(-) create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbmeta-arm-bsp/conf/machine/juno.conf +1
-0@@ -20,6 +20,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0" # Use kernel provided by linaro (Contains support for SCMi or HDMI) PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-arm" PREFERRED_VERSION_linux-linaro-arm ?= "4.19%" +PREFERRED_VERSION_trusted-firmware-a ?= "2.1%" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot firmware-image-juno"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +12
-1@@ -81,8 +81,19 @@ DEPENDS += " ${@bb.utils.contains('TFA_UBOOT', '1', 'u-boot', '', d)}" do_compile[depends] += " ${@bb.utils.contains('TFA_UBOOT', '1', 'u-boot:do_deploy', '', d)}" EXTRA_OEMAKE += "${@bb.utils.contains('TFA_UBOOT', '1', ' BL33=${DEPLOY_DIR_IMAGE}/u-boot.bin', '',d)}" - +# The following hack is needed to fit properly in yocto build environment +# TFA is forcing the host compiler and its flags in the Makefile using := +# assignment for GCC and CFLAGS. +# To properly use the native toolchain of yocto and the right libraries we need +# to pass the proper flags to gcc. This is achieved here by creating a gcc +# script to force passing to gcc the right CFLAGS and LDFLAGS do_compile() { + # Create an host gcc build parser to ensure the proper include path is used + mkdir -p bin + echo "#!/usr/bin/env bash" > bin/gcc + echo "$(which ${BUILD_CC}) ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \$@" >> bin/gcc + chmod a+x bin/gcc + export PATH="$PWD/bin:$PATH" oe_runmake ${TFA_BUILD_TARGET} }meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +3
-17@@ -1,6 +1,9 @@ # # Trusted firmware-A 2.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@@ -33,20 +36,3 @@ LIC_FILES_CHKSUM_MBEDTLS += " \ SRC_URI[mbedtls.md5sum] = "37cdec398ae9ebdd4640df74af893c95" SRC_URI[mbedtls.sha256sum] = "a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4" - -require trusted-firmware-a.inc - -# The following hack is needed to fit properly in yocto build environment -# TFA is forcing the host compiler and its flags in the Makefile using := -# assignment for GCC and CFLAGS. -# To properly use the native toolchain of yocto and the right libraries we need -# to pass the proper flags to gcc. This is achieved here by creating a gcc -# script to force passing to gcc the right CFLAGS and LDFLAGS -do_compile_prepend() { - #Create an host gcc build parser to ensure the proper include path is used - mkdir -p bin - echo "#!/usr/bin/env bash" > bin/gcc - echo "$(which ${BUILD_CC}) ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \$@" >> bin/gcc - chmod a+x bin/gcc - export PATH="$PWD/bin:$PATH" -}meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb new file +38
-0@@ -0,0 +1,38 @@ +# +# Trusted firmware-A 2.2 +# + +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" + +SRC_URI[tfa.md5sum] = "75c8f4958fb493d9bd7a8e5a9636ec18" +SRC_URI[tfa.sha256sum] = "7c4c00a4f28d3cfbb235fd1a1fb28c4d2fc1d657c9301686e7d8824ef575d059" + +# +# mbed TLS source +# Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1 +# + +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls" + +# mbed TLS v2.16.2 +SRCREV_mbedtls = "d81c11b8ab61fd5b2da8133aa73c5fe33a0633eb" + +LIC_FILES_CHKSUM_MBEDTLS += " \ + file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ + " + +SRC_URI[mbedtls.md5sum] = "37cdec398ae9ebdd4640df74af893c95" +SRC_URI[mbedtls.sha256sum] = "a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb new file +38
-0@@ -0,0 +1,38 @@ +# +# Trusted firmware-A 2.3 +# + +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" + +SRC_URI[tfa.md5sum] = "75c8f4958fb493d9bd7a8e5a9636ec18" +SRC_URI[tfa.sha256sum] = "7c4c00a4f28d3cfbb235fd1a1fb28c4d2fc1d657c9301686e7d8824ef575d059" + +# +# mbed TLS source +# Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1 +# + +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls" + +# mbed TLS v2.18.1 +SRCREV_mbedtls = "ca933c7e0c9e84738b168b6b0feb89af4183a60a" + +LIC_FILES_CHKSUM_MBEDTLS += " \ + file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ + " + +SRC_URI[mbedtls.md5sum] = "37cdec398ae9ebdd4640df74af893c95" +SRC_URI[mbedtls.sha256sum] = "a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +11
-18@@ -9,30 +9,23 @@ 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" -LIC_FILES_CHKSUM ?= "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89" +S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM = "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89" + +# # mbed TLS source # Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1 +# + SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls" -LIC_FILES_CHKSUM_MBEDTLS ?= " \ + +LIC_FILES_CHKSUM_MBEDTLS += " \ file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ " -S = "${WORKDIR}/git" - -# The following hack is needed to fit properly in yocto build environment -# TFA is forcing the host compiler and its flags in the Makefile using := -# assignment for GCC and CFLAGS. -# To properly use the native toolchain of yocto and the right libraries we need -# to pass the proper flags to gcc. This is achieved here by creating a gcc -# script to force passing to gcc the right CFLAGS and LDFLAGS -do_compile_prepend() { - # Create an host gcc build parser to ensure the proper include path is used - mkdir -p bin - echo "#!/usr/bin/env bash" > bin/gcc - echo "$(which ${BUILD_CC}) ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \$@" >> bin/gcc - chmod a+x bin/gcc - export PATH="$PWD/bin:$PATH" -}Signature · 1 line
2.17.1
Quoted 23 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Denys Dmytriyenko via lists.yoctoproject.org
Sent: 12 May 2020 01:31
To: Jon Mason <[email protected]>
Cc: [email protected]; nd <[email protected]>
Subject: Re: [meta-arm] [PATCH] Add recipes for TF-A versions 2.2 and 2.3Quoted 6 lines · Jon Mason
Add basic recipes for TF-A versions 2.2 and 2.3. Also, rearrange fields in the various TF-A recipes to make them uniform and move the
do_compile_prependto the inc file.Change-Id I85e4ac7bdc44ed85449e40fd2c94d73bf3e7d9e8Signed-off-by Jon Mason <[email protected]>Quoted 7 lines
--- meta-arm-bsp/conf/machine/juno.conf | 1 + .../trusted-firmware-a/trusted-firmware-a.inc | 13 ++++++- .../trusted-firmware-a_2.1.bb | 20 ++-------- .../trusted-firmware-a_2.2.bb | 38 +++++++++++++++++++ .../trusted-firmware-a_2.3.bb | 38 +++++++++++++++++++ .../trusted-firmware-a_git.bb | 29 ++++++--------
Quoted 3 lines
Any point in keeping git, 2.1, 2.2 and 2.3 around? Can we simplify it into one version?
In the current status, the juno machine still uses the 2.1 version.
Quoted 270 lines
Quoted 3 lines
6 files changed, 103 insertions(+), 36 deletions(-) create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb
Quoted 1 line
create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
meta-arm-
Quoted 2 lines
meta-arm- renamed from meta-arm-bsp/conf/machine/juno.conf +0
-0
bsp/conf/machine/juno.confmeta-arm-bsp/conf/machine/juno.conf SERIAL_CONSOLES = "115200;ttyAMA0" · line 25
Quoted 10 lines
index 878b6b1..898a863 100644
meta-arm-bsp/conf/machine/juno.conf +1
-0@@ -20,6 +20,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0" # Use kernel provided by linaro (Contains support for SCMi or HDMI) PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-arm" PREFERRED_VERSION_linux-linaro-arm ?= "4.19%" +PREFERRED_VERSION_trusted-firmware-a ?= "2.1%" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot firmware-image-juno"
Review
Quoted 2 lines
(quoted diff) +0
-0a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc DEPENDS += " ${@bb.utils.contains('TFA_UBOOT', '1',
Quoted 4 lines
index 93ca199..50a97a7 100644
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +0
-0@@ -81,8 +81,19 @@ DEPENDS += " ${@bb.utils.contains('TFA_UBOOT', '1','u-boot', '', d)}"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc DEPENDS += " ${@bb.utils.contains('TFA_UBOOT', '1', · line 81
Quoted 1 line
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +0
-0do_compile[depends] += " ${@bb.utils.contains('TFA_UBOOT', '1', 'u-boot:do_deploy', '', d)}"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc DEPENDS += " ${@bb.utils.contains('TFA_UBOOT', '1', · line 82
Quoted 1 line
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +0
-0EXTRA_OEMAKE += "${@bb.utils.contains('TFA_UBOOT', '1', 'BL33=${DEPLOY_DIR_IMAGE}/u-boot.bin', '',d)}"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc DEPENDS += " ${@bb.utils.contains('TFA_UBOOT', '1', 'u-boot', '', d)}"
Quoted 6 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +4
-1- +# The following hack is needed to fit properly in yocto build environment +# TFA is forcing the host compiler and its flags in the Makefile using := +# assignment for GCC and CFLAGS. +# To properly use the native toolchain of yocto and the right libraries weneed
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc DEPENDS += " ${@bb.utils.contains('TFA_UBOOT', '1', 'u-boot', '', d)}"
Quoted 4 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +3
-0+# to pass the proper flags to gcc. This is achieved here by creating a gcc +# script to force passing to gcc the right CFLAGS and LDFLAGS do_compile() { + # Create an host gcc build parser to ensure the proper include path isused
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc DEPENDS += " ${@bb.utils.contains('TFA_UBOOT', '1', 'u-boot', '', d)}"
Quoted 3 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +3
-0+ mkdir -p bin + echo "#!/usr/bin/env bash" > bin/gcc + echo "$(which ${BUILD_CC}) ${BUILD_CFLAGS} ${BUILD_LDFLAGS}\$@" >> bin/gcc
Review
Quoted 6 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +2
-0+ chmod a+x bin/gcc + export PATH="$PWD/bin:$PATH" oe_runmake ${TFA_BUILD_TARGET} }(quoted diff) +0
-0a_2.1.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- a_2.1.bb
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-
Quoted 3 lines
index e8933fb..4d41202 100644
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0
-0a_2.1.bb
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- line 7
Quoted 8 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +3
-0@@ -1,6 +1,9 @@ # # Trusted firmware-A 2.1 # + +require trusted-firmware-a.inc + SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- LIC_FILES_CHKSUM_MBEDTLS += " \ · line 38
Quoted 6 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0
-0# Use TF-A for version@@ -33,20 +36,3 @@ LIC_FILES_CHKSUM_MBEDTLS += " \ SRC_URI[mbedtls.md5sum] = "37cdec398ae9ebdd4640df74af893c95" SRC_URI[mbedtls.sha256sum] ="
a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- LIC_FILES_CHKSUM_MBEDTLS += " \ · line 42
Quoted 7 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0
-7- -require trusted-firmware-a.inc - -# The following hack is needed to fit properly in yocto build environment -# TFA is forcing the host compiler and its flags in the Makefile using := -# assignment for GCC and CFLAGS. -# To properly use the native toolchain of yocto and the right libraries weneed
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- LIC_FILES_CHKSUM_MBEDTLS += " \ · line 46
Quoted 4 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0
-4-# to pass the proper flags to gcc. This is achieved here by creating a gcc -# script to force passing to gcc the right CFLAGS and LDFLAGS -do_compile_prepend() { - #Create an host gcc build parser to ensure the proper include path isused
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- LIC_FILES_CHKSUM_MBEDTLS += " \ · line 49
Quoted 3 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0
-3- mkdir -p bin - echo "#!/usr/bin/env bash" > bin/gcc - echo "$(which ${BUILD_CC}) ${BUILD_CFLAGS} ${BUILD_LDFLAGS}\$@" >> bin/gcc
Review
Quoted 4 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0
-3- chmod a+x bin/gcc - export PATH="$PWD/bin:$PATH" -}(quoted diff) +0
-0a_2.2.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- a_2.2.bb
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-
Quoted 4 lines
new file mode 100644
index 0000000..4d5316emeta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- new file +0
-0a_2.2.bb
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- line 7
Quoted 8 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- new file +7
-0@@ -0,0 +1,38 @@ +# +# Trusted firmware-A 2.2 +# + +require trusted-firmware-a.inc + +SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- line 17
Quoted 10 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- new file +10
-0+ +# 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- line 20
Quoted 3 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- new file +3
-0+ +SRC_URI[tfa.md5sum] = "75c8f4958fb493d9bd7a8e5a9636ec18" +SRC_URI[tfa.sha256sum] ="
7c4c00a4f28d3cfbb235fd1a1fb28c4d2fc1d657c9301686e7d8824ef575d059"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- line 27
Quoted 7 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- new file +7
-0+ +# +# mbed TLS source +# Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1 +# + +SRC_URI_MBEDTLS ="
git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- line 33
Quoted 6 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- new file +6
-0+ +# mbed TLS v2.16.2 +SRCREV_mbedtls = "d81c11b8ab61fd5b2da8133aa73c5fe33a0633eb" + +LIC_FILES_CHKSUM_MBEDTLS += " \ + file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- line 38
Quoted 5 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- new file +5
-0+ file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ + " + +SRC_URI[mbedtls.md5sum] = "37cdec398ae9ebdd4640df74af893c95" +SRC_URI[mbedtls.sha256sum] ="
a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4"Review
Quoted 1 line
(quoted diff) +0
-0a_2.3.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- a_2.3.bb
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-
Quoted 4 lines
new file mode 100644
index 0000000..bfda87bmeta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- new file +0
-0a_2.3.bb
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- line 7
Quoted 8 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- new file +7
-0@@ -0,0 +1,38 @@ +# +# Trusted firmware-A 2.3 +# + +require trusted-firmware-a.inc + +SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- line 17
Quoted 10 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- new file +10
-0+ +# 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- line 20
Quoted 3 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- new file +3
-0+ +SRC_URI[tfa.md5sum] = "75c8f4958fb493d9bd7a8e5a9636ec18" +SRC_URI[tfa.sha256sum] ="
7c4c00a4f28d3cfbb235fd1a1fb28c4d2fc1d657c9301686e7d8824ef575d059"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- line 27
Quoted 7 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- new file +7
-0+ +# +# mbed TLS source +# Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1 +# + +SRC_URI_MBEDTLS ="
git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- line 33
Quoted 6 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- new file +6
-0+ +# mbed TLS v2.18.1 +SRCREV_mbedtls = "ca933c7e0c9e84738b168b6b0feb89af4183a60a" + +LIC_FILES_CHKSUM_MBEDTLS += " \ + file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- line 38
Quoted 5 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- new file +5
-0+ file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ + " + +SRC_URI[mbedtls.md5sum] = "37cdec398ae9ebdd4640df74af893c95" +SRC_URI[mbedtls.sha256sum] ="
a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4"Review
Quoted 1 line
(quoted diff) +0
-0a_git.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- a_git.bb
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-
Quoted 3 lines
index 4bf3ae5..c443ecd 100644
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +0
-0a_git.bb
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- DEFAULT_PREFERENCE = "-1" · line 11
Quoted 4 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +0
-0@@ -9,30 +9,23 @@ DEFAULT_PREFERENCE = "-1" require trusted-firmware-a.inc SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- DEFAULT_PREFERENCE = "-1" · line 13
Quoted 4 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +2
-1+ +# Use TF-A for version SRCREV_FORMAT = "tfa" -LIC_FILES_CHKSUM ?="file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- DEFAULT_PREFERENCE = "-1" · line 17
Quoted 4 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +3
-0+S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM ="file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- DEFAULT_PREFERENCE = "-1" · line 24
Quoted 7 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +4
-0+ +# # mbed TLS source # Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1 +# + SRC_URI_MBEDTLS ="
git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- DEFAULT_PREFERENCE = "-1" · line 27
Quoted 4 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +2
-1-LIC_FILES_CHKSUM_MBEDTLS ?= " \ + +LIC_FILES_CHKSUM_MBEDTLS += " \ file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57\
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- DEFAULT_PREFERENCE = "-1" · line 27
Quoted 9 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +0
-6file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ " -S = "${WORKDIR}/git" - -# The following hack is needed to fit properly in yocto build environment -# TFA is forcing the host compiler and its flags in the Makefile using := -# assignment for GCC and CFLAGS. -# To properly use the native toolchain of yocto and the right libraries weneed
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- DEFAULT_PREFERENCE = "-1" · line 31
Quoted 4 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +0
-4-# to pass the proper flags to gcc. This is achieved here by creating a gcc -# script to force passing to gcc the right CFLAGS and LDFLAGS -do_compile_prepend() { - # Create an host gcc build parser to ensure the proper include path isused
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- DEFAULT_PREFERENCE = "-1" · line 34
Quoted 3 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +0
-3- mkdir -p bin - echo "#!/usr/bin/env bash" > bin/gcc - echo "$(which ${BUILD_CC}) ${BUILD_CFLAGS} ${BUILD_LDFLAGS}\$@" >> bin/gcc
Quoted 8 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware- renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +0
-4- chmod a+x bin/gcc - export PATH="$PWD/bin:$PATH" -} --2.17.1
Quoted 62 lines · Jon Mason
Add basic recipes for TF-A versions 2.2 and 2.3. Also, rearrange fields in the various TF-A recipes to make them uniform and move the
do_compile_prependto the inc file.Change-Id I85e4ac7bdc44ed85449e40fd2c94d73bf3e7d9e8Signed-off-by Jon Mason <[email protected]>--- meta-arm-bsp/conf/machine/juno.conf | 1 + .../trusted-firmware-a/trusted-firmware-a.inc | 13 ++++++- .../trusted-firmware-a_2.1.bb | 20 ++-------- .../trusted-firmware-a_2.2.bb | 38 +++++++++++++++++++ .../trusted-firmware-a_2.3.bb | 38 +++++++++++++++++++ .../trusted-firmware-a_git.bb | 29 ++++++-------- 6 files changed, 103 insertions(+), 36 deletions(-) create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/ trusted-firmware-a_2.2.bb create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
meta-arm-bsp/conf/machine/juno.conf +1
-0@@ -20,6 +20,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0" # Use kernel provided by linaro (Contains support for SCMi or HDMI) PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-arm" PREFERRED_VERSION_linux-linaro-arm ?= "4.19%" +PREFERRED_VERSION_trusted-firmware-a ?= "2.1%" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-bootfirmware-image-juno"
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc index 93ca199..50a97a7 100644
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +0
-0@@ -81,8 +81,19 @@ DEPENDS += " ${@bb.utils.contains('TFA_UBOOT', '1','u-boot', '', d)}"
do_compile[depends] += " ${@bb.utils.contains('TFA_UBOOT', '1',
'u-boot:do_deploy', '', d)}"
EXTRA_OEMAKE+= "${@bb.utils.contains('TFA_UBOOT', '1', '
BL33=${DEPLOY_DIR_IMAGE}/u-boot.bin', '',d)}"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +4
-1- +# The following hack is needed to fit properly in yocto build environment +# TFA is forcing the host compiler and its flags in the Makefile using := +# assignment for GCC and CFLAGS. +# To properly use the native toolchain of yocto and the right librarieswe need
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +3
-0+# to pass the proper flags to gcc. This is achieved here by creating a gcc +# script to force passing to gcc the right CFLAGS and LDFLAGS do_compile() { + # Create an host gcc build parser to ensure the proper include pathis used
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +3
-0+ mkdir -p bin + echo "#!/usr/bin/env bash" > bin/gcc + echo "$(which ${BUILD_CC}) ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \$@" >>bin/gcc
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc DEPENDS += " ${@bb.utils.contains('TFA_UBOOT', '1', 'u-boot', '', d)}" · line 96
Quoted 2 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +2
-0+ chmod a+x bin/gcc + export PATH="$PWD/bin:$PATH"
I didn't include this in my version because I couldn't figure out why it was necessary. Can it be removed?
oe_runmake ${TFA_BUILD_TARGET}Quoted 213 lines
}
(quoted diff) +0
-0trusted-firmware-a_2.1.bb b/meta-arm/recipes-bsp/trusted-firmware-a/ trusted-firmware-a_2.1.bb
index e8933fb..4d41202 100644meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +3
-0@@ -1,6 +1,9 @@ # # Trusted firmware-A 2.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
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0
-0@@ -33,20 +36,3 @@ LIC_FILES_CHKSUM_MBEDTLS += " \ SRC_URI[mbedtls.md5sum] = "37cdec398ae9ebdd4640df74af893c95" SRC_URI[mbedtls.sha256sum] ="
a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0
-7- -require trusted-firmware-a.inc - -# The following hack is needed to fit properly in yocto build environment -# TFA is forcing the host compiler and its flags in the Makefile using := -# assignment for GCC and CFLAGS. -# To properly use the native toolchain of yocto and the right librarieswe need
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0
-4-# to pass the proper flags to gcc. This is achieved here by creating a gcc -# script to force passing to gcc the right CFLAGS and LDFLAGS -do_compile_prepend() { - #Create an host gcc build parser to ensure the proper include path isused
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0
-3- mkdir -p bin - echo "#!/usr/bin/env bash" > bin/gcc - echo "$(which ${BUILD_CC}) ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \$@" >>bin/gcc
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0
-3- chmod a+x bin/gcc - export PATH="$PWD/bin:$PATH" -}(quoted diff) +0
-0trusted-firmware-a_2.2.bb b/meta-arm/recipes-bsp/trusted-firmware-a/ trusted-firmware-a_2.2.bb
new file mode 100644
index 0000000..4d5316emeta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb new file +7
-0@@ -0,0 +1,38 @@ +# +# Trusted firmware-A 2.2 +# + +require trusted-firmware-a.inc + +SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa "
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb new file +10
-0+ +# 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.2.bb new file +3
-0+ +SRC_URI[tfa.md5sum] = "75c8f4958fb493d9bd7a8e5a9636ec18" +SRC_URI[tfa.sha256sum] ="
7c4c00a4f28d3cfbb235fd1a1fb28c4d2fc1d657c9301686e7d8824ef575d059"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb new file +7
-0+ +# +# mbed TLS source +# Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1 +# + +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls "
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb new file +11
-0+ +# mbed TLS v2.16.2 +SRCREV_mbedtls = "d81c11b8ab61fd5b2da8133aa73c5fe33a0633eb" + +LIC_FILES_CHKSUM_MBEDTLS += " \ + file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ + " + +SRC_URI[mbedtls.md5sum] = "37cdec398ae9ebdd4640df74af893c95" +SRC_URI[mbedtls.sha256sum] ="
a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4"(quoted diff) +0
-0trusted-firmware-a_2.3.bb b/meta-arm/recipes-bsp/trusted-firmware-a/ trusted-firmware-a_2.3.bb
new file mode 100644
index 0000000..bfda87bmeta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb new file +7
-0@@ -0,0 +1,38 @@ +# +# Trusted firmware-A 2.3 +# + +require trusted-firmware-a.inc + +SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa "
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb new file +10
-0+ +# 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_2.3.bb new file +3
-0+ +SRC_URI[tfa.md5sum] = "75c8f4958fb493d9bd7a8e5a9636ec18" +SRC_URI[tfa.sha256sum] ="
7c4c00a4f28d3cfbb235fd1a1fb28c4d2fc1d657c9301686e7d8824ef575d059"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb new file +7
-0+ +# +# mbed TLS source +# Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1 +# + +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls "
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb new file +11
-0+ +# mbed TLS v2.18.1 +SRCREV_mbedtls = "ca933c7e0c9e84738b168b6b0feb89af4183a60a" + +LIC_FILES_CHKSUM_MBEDTLS += " \ + file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ + " + +SRC_URI[mbedtls.md5sum] = "37cdec398ae9ebdd4640df74af893c95" +SRC_URI[mbedtls.sha256sum] ="
a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4"(quoted diff) +0
-0trusted-firmware-a_git.bb b/meta-arm/recipes-bsp/trusted-firmware-a/ trusted-firmware-a_git.bb
index 4bf3ae5..c443ecd 100644meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +0
-0@@ -9,30 +9,23 @@ DEFAULT_PREFERENCE = "-1" require trusted-firmware-a.inc SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa "
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +2
-1+ +# Use TF-A for version SRCREV_FORMAT = "tfa" -LIC_FILES_CHKSUM ?="file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +3
-0+S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM ="file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +4
-0+ +# # mbed TLS source # Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1 +# + SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls "
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +2
-7-LIC_FILES_CHKSUM_MBEDTLS ?= " \ + +LIC_FILES_CHKSUM_MBEDTLS += " \ file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ " -S = "${WORKDIR}/git" - -# The following hack is needed to fit properly in yocto build environment -# TFA is forcing the host compiler and its flags in the Makefile using := -# assignment for GCC and CFLAGS. -# To properly use the native toolchain of yocto and the right librarieswe need
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +0
-4-# to pass the proper flags to gcc. This is achieved here by creating a gcc -# script to force passing to gcc the right CFLAGS and LDFLAGS -do_compile_prepend() { - # Create an host gcc build parser to ensure the proper include pathis used
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +0
-3- mkdir -p bin - echo "#!/usr/bin/env bash" > bin/gcc - echo "$(which ${BUILD_CC}) ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \$@" >>bin/gcc
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +0
-4- chmod a+x bin/gcc - export PATH="$PWD/bin:$PATH" -} --2.17.1
Quoted 61 lines · Joshua Watt
Quoted 59 lines · Jon Mason
Add basic recipes for TF-A versions 2.2 and 2.3. Also, rearrange fields in the various TF-A recipes to make them uniform and move the
do_compile_prependto the inc file.Change-Id I85e4ac7bdc44ed85449e40fd2c94d73bf3e7d9e8Signed-off-by Jon Mason <[email protected]>--- meta-arm-bsp/conf/machine/juno.conf | 1 + .../trusted-firmware-a/trusted-firmware-a.inc | 13 ++++++- .../trusted-firmware-a_2.1.bb | 20 ++-------- .../trusted-firmware-a_2.2.bb | 38 +++++++++++++++++++ .../trusted-firmware-a_2.3.bb | 38 +++++++++++++++++++ .../trusted-firmware-a_git.bb | 29 ++++++-------- 6 files changed, 103 insertions(+), 36 deletions(-) create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/ trusted-firmware-a_2.2.bb create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
meta-arm-bsp/conf/machine/juno.conf +1
-0@@ -20,6 +20,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0" # Use kernel provided by linaro (Contains support for SCMi or HDMI) PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-arm" PREFERRED_VERSION_linux-linaro-arm ?= "4.19%" +PREFERRED_VERSION_trusted-firmware-a ?= "2.1%" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-bootfirmware-image-juno"
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc index 93ca199..50a97a7 100644
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +0
-0@@ -81,8 +81,19 @@ DEPENDS += " ${@bb.utils.contains('TFA_UBOOT', '1','u-boot', '', d)}"
do_compile[depends] += " ${@bb.utils.contains('TFA_UBOOT', '1',
'u-boot:do_deploy', '', d)}"
EXTRA_OEMAKE+= "${@bb.utils.contains('TFA_UBOOT', '1', '
BL33=${DEPLOY_DIR_IMAGE}/u-boot.bin', '',d)}"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +4
-1- +# The following hack is needed to fit properly in yocto build environment +# TFA is forcing the host compiler and its flags in the Makefile using := +# assignment for GCC and CFLAGS. +# To properly use the native toolchain of yocto and the right librarieswe need
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +3
-0+# to pass the proper flags to gcc. This is achieved here by creating a gcc +# script to force passing to gcc the right CFLAGS and LDFLAGS do_compile() { + # Create an host gcc build parser to ensure the proper include pathis used
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +2
-0+ mkdir -p bin + echo "#!/usr/bin/env bash" > bin/gcc
Quoted 8 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc DEPENDS += " ${@bb.utils.contains('TFA_UBOOT', '1', 'u-boot', '', d)}" · line 96
Quoted 5 lines
+ echo "$(which ${BUILD_CC}) ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \$@" >>
bin/gccmeta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +2
-0+ chmod a+x bin/gcc + export PATH="$PWD/bin:$PATH"I didn't include this in my version because I couldn't figure out why it was necessary. Can it be removed?
Yeah, I'm not sure either - I've been building 2.0, 2.1 and 2.2 w/o this just fine...
Quoted 216 lines
oe_runmake ${TFA_BUILD_TARGET}Quoted 213 lines
}
(quoted diff) +0
-0trusted-firmware-a_2.1.bb b/meta-arm/recipes-bsp/trusted-firmware-a/ trusted-firmware-a_2.1.bb
index e8933fb..4d41202 100644meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +3
-0@@ -1,6 +1,9 @@ # # Trusted firmware-A 2.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
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0
-0@@ -33,20 +36,3 @@ LIC_FILES_CHKSUM_MBEDTLS += " \ SRC_URI[mbedtls.md5sum] = "37cdec398ae9ebdd4640df74af893c95" SRC_URI[mbedtls.sha256sum] ="
a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0
-7- -require trusted-firmware-a.inc - -# The following hack is needed to fit properly in yocto build environment -# TFA is forcing the host compiler and its flags in the Makefile using := -# assignment for GCC and CFLAGS. -# To properly use the native toolchain of yocto and the right librarieswe need
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0
-4-# to pass the proper flags to gcc. This is achieved here by creating a gcc -# script to force passing to gcc the right CFLAGS and LDFLAGS -do_compile_prepend() { - #Create an host gcc build parser to ensure the proper include path isused
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0
-3- mkdir -p bin - echo "#!/usr/bin/env bash" > bin/gcc - echo "$(which ${BUILD_CC}) ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \$@" >>bin/gcc
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0
-3- chmod a+x bin/gcc - export PATH="$PWD/bin:$PATH" -}(quoted diff) +0
-0trusted-firmware-a_2.2.bb b/meta-arm/recipes-bsp/trusted-firmware-a/ trusted-firmware-a_2.2.bb
new file mode 100644
index 0000000..4d5316emeta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb new file +7
-0@@ -0,0 +1,38 @@ +# +# Trusted firmware-A 2.2 +# + +require trusted-firmware-a.inc + +SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa "
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb new file +10
-0+ +# 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.2.bb new file +3
-0+ +SRC_URI[tfa.md5sum] = "75c8f4958fb493d9bd7a8e5a9636ec18" +SRC_URI[tfa.sha256sum] ="
7c4c00a4f28d3cfbb235fd1a1fb28c4d2fc1d657c9301686e7d8824ef575d059"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb new file +7
-0+ +# +# mbed TLS source +# Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1 +# + +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls "
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb new file +11
-0+ +# mbed TLS v2.16.2 +SRCREV_mbedtls = "d81c11b8ab61fd5b2da8133aa73c5fe33a0633eb" + +LIC_FILES_CHKSUM_MBEDTLS += " \ + file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ + " + +SRC_URI[mbedtls.md5sum] = "37cdec398ae9ebdd4640df74af893c95" +SRC_URI[mbedtls.sha256sum] ="
a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4"(quoted diff) +0
-0trusted-firmware-a_2.3.bb b/meta-arm/recipes-bsp/trusted-firmware-a/ trusted-firmware-a_2.3.bb
new file mode 100644
index 0000000..bfda87bmeta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb new file +7
-0@@ -0,0 +1,38 @@ +# +# Trusted firmware-A 2.3 +# + +require trusted-firmware-a.inc + +SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa "
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb new file +10
-0+ +# 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_2.3.bb new file +3
-0+ +SRC_URI[tfa.md5sum] = "75c8f4958fb493d9bd7a8e5a9636ec18" +SRC_URI[tfa.sha256sum] ="
7c4c00a4f28d3cfbb235fd1a1fb28c4d2fc1d657c9301686e7d8824ef575d059"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb new file +7
-0+ +# +# mbed TLS source +# Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1 +# + +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls "
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb new file +11
-0+ +# mbed TLS v2.18.1 +SRCREV_mbedtls = "ca933c7e0c9e84738b168b6b0feb89af4183a60a" + +LIC_FILES_CHKSUM_MBEDTLS += " \ + file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ + " + +SRC_URI[mbedtls.md5sum] = "37cdec398ae9ebdd4640df74af893c95" +SRC_URI[mbedtls.sha256sum] ="
a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4"(quoted diff) +0
-0trusted-firmware-a_git.bb b/meta-arm/recipes-bsp/trusted-firmware-a/ trusted-firmware-a_git.bb
index 4bf3ae5..c443ecd 100644meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +0
-0@@ -9,30 +9,23 @@ DEFAULT_PREFERENCE = "-1" require trusted-firmware-a.inc SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa "
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +2
-1+ +# Use TF-A for version SRCREV_FORMAT = "tfa" -LIC_FILES_CHKSUM ?="file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +3
-0+S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM ="file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +4
-0+ +# # mbed TLS source # Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1 +# + SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls "
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +2
-7-LIC_FILES_CHKSUM_MBEDTLS ?= " \ + +LIC_FILES_CHKSUM_MBEDTLS += " \ file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ " -S = "${WORKDIR}/git" - -# The following hack is needed to fit properly in yocto build environment -# TFA is forcing the host compiler and its flags in the Makefile using := -# assignment for GCC and CFLAGS. -# To properly use the native toolchain of yocto and the right librarieswe need
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +0
-4-# to pass the proper flags to gcc. This is achieved here by creating a gcc -# script to force passing to gcc the right CFLAGS and LDFLAGS -do_compile_prepend() { - # Create an host gcc build parser to ensure the proper include pathis used
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +0
-3- mkdir -p bin - echo "#!/usr/bin/env bash" > bin/gcc - echo "$(which ${BUILD_CC}) ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \$@" >>bin/gcc
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +0
-4- chmod a+x bin/gcc - export PATH="$PWD/bin:$PATH" -} --2.17.1
Quoted 71 lines · Denys Dmytriyenko
Quoted 61 lines · Joshua Watt
Quoted 59 lines · Jon Mason
Add basic recipes for TF-A versions 2.2 and 2.3. Also, rearrange fields in the various TF-A recipes to make them uniform and move the
do_compile_prependto the inc file.Change-Id I85e4ac7bdc44ed85449e40fd2c94d73bf3e7d9e8Signed-off-by Jon Mason <[email protected]>--- meta-arm-bsp/conf/machine/juno.conf | 1 + .../trusted-firmware-a/trusted-firmware-a.inc | 13 ++++++- .../trusted-firmware-a_2.1.bb | 20 ++-------- .../trusted-firmware-a_2.2.bb | 38 +++++++++++++++++++ .../trusted-firmware-a_2.3.bb | 38 +++++++++++++++++++ .../trusted-firmware-a_git.bb | 29 ++++++-------- 6 files changed, 103 insertions(+), 36 deletions(-) create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/ trusted-firmware-a_2.2.bb create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
meta-arm-bsp/conf/machine/juno.conf +1
-0@@ -20,6 +20,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0" # Use kernel provided by linaro (Contains support for SCMi or HDMI) PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-arm" PREFERRED_VERSION_linux-linaro-arm ?= "4.19%" +PREFERRED_VERSION_trusted-firmware-a ?= "2.1%" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-bootfirmware-image-juno"
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc index 93ca199..50a97a7 100644
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +0
-0@@ -81,8 +81,19 @@ DEPENDS += " ${@bb.utils.contains('TFA_UBOOT', '1','u-boot', '', d)}"
do_compile[depends] += " ${@bb.utils.contains('TFA_UBOOT', '1',
'u-boot:do_deploy', '', d)}"
EXTRA_OEMAKE+= "${@bb.utils.contains('TFA_UBOOT', '1', '
BL33=${DEPLOY_DIR_IMAGE}/u-boot.bin', '',d)}"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +4
-1- +# The following hack is needed to fit properly in yocto build environment +# TFA is forcing the host compiler and its flags in the Makefile using := +# assignment for GCC and CFLAGS. +# To properly use the native toolchain of yocto and the right librarieswe need
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +3
-0+# to pass the proper flags to gcc. This is achieved here by creating a gcc +# script to force passing to gcc the right CFLAGS and LDFLAGS do_compile() { + # Create an host gcc build parser to ensure the proper include pathis used
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +2
-0+ mkdir -p bin + echo "#!/usr/bin/env bash" > bin/gccQuoted 8 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc DEPENDS += " ${@bb.utils.contains('TFA_UBOOT', '1', 'u-boot', '', d)}" · line 96
Quoted 5 lines
+ echo "$(which ${BUILD_CC}) ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \$@" >>
bin/gccmeta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +2
-0+ chmod a+x bin/gcc + export PATH="$PWD/bin:$PATH"I didn't include this in my version because I couldn't figure out why it was necessary. Can it be removed?
Quoted 2 lines
Yeah, I'm not sure either - I've been building 2.0, 2.1 and 2.2 w/o this just fine...
IIRC, removing this with a minimal build environment causes errors with missing include files for the fiptool.
Thanks,
Jon
Quoted 221 lines
Quoted 218 lines
oe_runmake ${TFA_BUILD_TARGET}Quoted 213 lines
}
(quoted diff) +0
-0trusted-firmware-a_2.1.bb b/meta-arm/recipes-bsp/trusted-firmware-a/ trusted-firmware-a_2.1.bb
index e8933fb..4d41202 100644meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +3
-0@@ -1,6 +1,9 @@ # # Trusted firmware-A 2.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
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0
-0@@ -33,20 +36,3 @@ LIC_FILES_CHKSUM_MBEDTLS += " \ SRC_URI[mbedtls.md5sum] = "37cdec398ae9ebdd4640df74af893c95" SRC_URI[mbedtls.sha256sum] ="
a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0
-7- -require trusted-firmware-a.inc - -# The following hack is needed to fit properly in yocto build environment -# TFA is forcing the host compiler and its flags in the Makefile using := -# assignment for GCC and CFLAGS. -# To properly use the native toolchain of yocto and the right librarieswe need
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0
-4-# to pass the proper flags to gcc. This is achieved here by creating a gcc -# script to force passing to gcc the right CFLAGS and LDFLAGS -do_compile_prepend() { - #Create an host gcc build parser to ensure the proper include path isused
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0
-3- mkdir -p bin - echo "#!/usr/bin/env bash" > bin/gcc - echo "$(which ${BUILD_CC}) ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \$@" >>bin/gcc
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb +0
-3- chmod a+x bin/gcc - export PATH="$PWD/bin:$PATH" -}(quoted diff) +0
-0trusted-firmware-a_2.2.bb b/meta-arm/recipes-bsp/trusted-firmware-a/ trusted-firmware-a_2.2.bb
new file mode 100644
index 0000000..4d5316emeta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb new file +7
-0@@ -0,0 +1,38 @@ +# +# Trusted firmware-A 2.2 +# + +require trusted-firmware-a.inc + +SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa "
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb new file +10
-0+ +# 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.2.bb new file +3
-0+ +SRC_URI[tfa.md5sum] = "75c8f4958fb493d9bd7a8e5a9636ec18" +SRC_URI[tfa.sha256sum] ="
7c4c00a4f28d3cfbb235fd1a1fb28c4d2fc1d657c9301686e7d8824ef575d059"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb new file +7
-0+ +# +# mbed TLS source +# Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1 +# + +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls "
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb new file +11
-0+ +# mbed TLS v2.16.2 +SRCREV_mbedtls = "d81c11b8ab61fd5b2da8133aa73c5fe33a0633eb" + +LIC_FILES_CHKSUM_MBEDTLS += " \ + file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ + " + +SRC_URI[mbedtls.md5sum] = "37cdec398ae9ebdd4640df74af893c95" +SRC_URI[mbedtls.sha256sum] ="
a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4"(quoted diff) +0
-0trusted-firmware-a_2.3.bb b/meta-arm/recipes-bsp/trusted-firmware-a/ trusted-firmware-a_2.3.bb
new file mode 100644
index 0000000..bfda87bmeta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb new file +7
-0@@ -0,0 +1,38 @@ +# +# Trusted firmware-A 2.3 +# + +require trusted-firmware-a.inc + +SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa "
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb new file +10
-0+ +# 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_2.3.bb new file +3
-0+ +SRC_URI[tfa.md5sum] = "75c8f4958fb493d9bd7a8e5a9636ec18" +SRC_URI[tfa.sha256sum] ="
7c4c00a4f28d3cfbb235fd1a1fb28c4d2fc1d657c9301686e7d8824ef575d059"meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb new file +7
-0+ +# +# mbed TLS source +# Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1 +# + +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls "
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb new file +11
-0+ +# mbed TLS v2.18.1 +SRCREV_mbedtls = "ca933c7e0c9e84738b168b6b0feb89af4183a60a" + +LIC_FILES_CHKSUM_MBEDTLS += " \ + file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ + " + +SRC_URI[mbedtls.md5sum] = "37cdec398ae9ebdd4640df74af893c95" +SRC_URI[mbedtls.sha256sum] ="
a6834fcd7b7e64b83dfaaa6ee695198cb5019a929b2806cb0162e049f98206a4"(quoted diff) +0
-0trusted-firmware-a_git.bb b/meta-arm/recipes-bsp/trusted-firmware-a/ trusted-firmware-a_git.bb
index 4bf3ae5..c443ecd 100644meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +0
-0@@ -9,30 +9,23 @@ DEFAULT_PREFERENCE = "-1" require trusted-firmware-a.inc SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa "
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +2
-1+ +# Use TF-A for version SRCREV_FORMAT = "tfa" -LIC_FILES_CHKSUM ?="file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +3
-0+S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM ="file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +4
-0+ +# # mbed TLS source # Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1 +# + SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls "
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +2
-7-LIC_FILES_CHKSUM_MBEDTLS ?= " \ + +LIC_FILES_CHKSUM_MBEDTLS += " \ file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ " -S = "${WORKDIR}/git" - -# The following hack is needed to fit properly in yocto build environment -# TFA is forcing the host compiler and its flags in the Makefile using := -# assignment for GCC and CFLAGS. -# To properly use the native toolchain of yocto and the right librarieswe need
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +0
-4-# to pass the proper flags to gcc. This is achieved here by creating a gcc -# script to force passing to gcc the right CFLAGS and LDFLAGS -do_compile_prepend() { - # Create an host gcc build parser to ensure the proper include pathis used
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +0
-3- mkdir -p bin - echo "#!/usr/bin/env bash" > bin/gcc - echo "$(which ${BUILD_CC}) ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \$@" >>bin/gcc
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +0
-4- chmod a+x bin/gcc - export PATH="$PWD/bin:$PATH" -} --2.17.1