[PATCH 1/4] arm/trusted-firmware-m: clean up DEPENDS

[PATCH 1/4] arm/trusted-firmware-m: clean up DEPENDS

[Ross Burton]

TFM_DEPENDS isn't used anywhere so remove it.

Change-Id: I7707ada458a001a081aac1f417dc78d6ca37a307
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.0.bb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.0.bb b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.0.bb
index 80df2f1..f24f579 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.0.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.0.bb
@@ -35,11 +35,8 @@ SRCREV_cmsis = "5.5.0"
 
 inherit python3native deploy
 
-TFM_DEPENDS ?= ""
-DEPENDS += "${TFM_DEPENDS}"
 DEPENDS += "cmake-native"
-DEPENDS += "python3-cryptography-native python3-pyasn1-native"
-DEPENDS += "python3-cbor-native"
+DEPENDS += "python3-cryptography-native python3-pyasn1-native python3-cbor-native"
 
 S = "${WORKDIR}/git/tfm"
 B = "${WORKDIR}/build"
-- 
2.25.1

[PATCH 2/4] arm/trusted-firmware-m: no need to DEPENDS on a C runtime

[Ross Burton]

This recipe is for baremetal firmware, so remove libc from DEPENDS.

Change-Id: Id37f82a4dad6207237117b65d242617467b83ed2
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.0.bb   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.0.bb b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.0.bb
index f24f579..1ec24d5 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.0.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.0.bb
@@ -35,6 +35,9 @@ SRCREV_cmsis = "5.5.0"
 
 inherit python3native deploy
 
+# Baremetal, just need a compiler
+DEPENDS_remove = "virtual/${TARGET_PREFIX}compilerlibs virtual/libc"
+
 DEPENDS += "cmake-native"
 DEPENDS += "python3-cryptography-native python3-pyasn1-native python3-cbor-native"
 
-- 
2.25.1

[PATCH 3/4] arm/trusted-firmware-a: no need to DEPENDS on a C runtime

[Ross Burton]

This recipe is for baremetal firmware, so remove libc from DEPENDS.

Change-Id: I89d0dde3f48599b9221cb1e153344dbc05e8cebe
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 3fcb6f8..d37c470 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
@@ -77,9 +77,12 @@ LD[unexport] = "1"
 # No configure
 do_configure[noexec] = "1"
 
+# Baremetal, just need a compiler
+DEPENDS_remove = "virtual/${TARGET_PREFIX}compilerlibs virtual/libc"
+
 # We need dtc for dtbs compilation
 # We need openssl for fiptool
-DEPENDS_append = " dtc-native openssl-native"
+DEPENDS = "dtc-native openssl-native"
 DEPENDS_append_aarch64_qemuall ?= " optee-os"
 
 # CC and LD introduce arguments which conflict with those otherwise provided by
-- 
2.25.1

[PATCH 4/4] arm/scp-firmware: inhibit default DEPENDS

[Ross Burton]

This is baremetal firmware so doesn't use the C runtime library and uses
the binary compiler for 32-bit Arm instead of the standard one, so
inhibit the default dependencies entirely.

Change-Id: Idd52bb09fea49640f1fc38e1c5a47ca8eecca107
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.6.0.bb | 3 ++-
 meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.7.0.bb | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.6.0.bb b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.6.0.bb
index ab31746..123f442 100644
--- a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.6.0.bb
+++ b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.6.0.bb
@@ -17,7 +17,8 @@ SCP_PLATFORM        ?= "invalid"
 SCP_COMPILER        ?= "arm-none-eabi"
 SCP_LOG_LEVEL       ?= "WARN"
 
-DEPENDS += "virtual/arm-none-eabi-gcc-native"
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = "virtual/arm-none-eabi-gcc-native"
 
 SCP_BUILD_STR = "${@bb.utils.contains('SCP_BUILD_RELEASE', '1', 'release', 'debug', d)}"
 
diff --git a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.7.0.bb b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.7.0.bb
index 13092f1..3a71b2e 100644
--- a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.7.0.bb
+++ b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.7.0.bb
@@ -16,7 +16,8 @@ SCP_PLATFORM        ?= "invalid"
 SCP_COMPILER        ?= "arm-none-eabi"
 SCP_LOG_LEVEL       ?= "WARN"
 
-DEPENDS += "virtual/arm-none-eabi-gcc-native"
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = "virtual/arm-none-eabi-gcc-native"
 
 SCP_BUILD_STR = "${@bb.utils.contains('SCP_BUILD_RELEASE', '1', 'release', 'debug', d)}"
 
-- 
2.25.1

Re: [meta-arm] [PATCH 1/4] arm/trusted-firmware-m: clean up DEPENDS

[Jon Mason]

On Thu, Dec 03, 2020 at 05:20:56PM +0000, Ross Burton wrote:
> TFM_DEPENDS isn't used anywhere so remove it.
> 
> Change-Id: I7707ada458a001a081aac1f417dc78d6ca37a307
> Signed-off-by: Ross Burton <ross.burton@arm.com>

Series pulled into master.

Thanks,
Jon

> ---
>  .../recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.0.bb | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.0.bb b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.0.bb
> index 80df2f1..f24f579 100644
> --- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.0.bb
> +++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.0.bb
> @@ -35,11 +35,8 @@ SRCREV_cmsis = "5.5.0"
>  
>  inherit python3native deploy
>  
> -TFM_DEPENDS ?= ""
> -DEPENDS += "${TFM_DEPENDS}"
>  DEPENDS += "cmake-native"
> -DEPENDS += "python3-cryptography-native python3-pyasn1-native"
> -DEPENDS += "python3-cbor-native"
> +DEPENDS += "python3-cryptography-native python3-pyasn1-native python3-cbor-native"
>  
>  S = "${WORKDIR}/git/tfm"
>  B = "${WORKDIR}/build"
> -- 
> 2.25.1
> 

> 
> 
>