[PATCH 1/2] meta-arm: trusted-firmware-a: add branch name for mbedtls

[PATCH 1/2] meta-arm: trusted-firmware-a: add branch name for mbedtls

[Usama Arif]

It appears that the mbedtls team have moved the SHA which
meta-arm was using from master branch. It is still present
in mbedtls-2.18 branch so this is now used.

Change-Id: Ie932f446067767e85a25583b1bdc02b4739e323f
Signed-off-by: Usama Arif <usama.arif@arm.com>
Signed-off-by: Prabin CA <prabin.ca@rm.com>
---
 .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
index 8286b64..7279173 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
@@ -21,7 +21,7 @@ LIC_FILES_CHKSUM = "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89
 # 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"
+SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=mbedtls-2.18"
 
 # mbed TLS v2.18.1
 SRCREV_mbedtls = "ca933c7e0c9e84738b168b6b0feb89af4183a60a"
-- 
2.17.1

[PATCH 2/2] arm-bsp: trusted-firmware: tc0: remove SHA for mbedtls

[Usama Arif]

Use the default one from trusted-firmware-a_2.3

Change-Id: I496db01818b172b109e8dab04e39a66bafd35a2d
Signed-off-by: Usama Arif <usama.arif@arm.com>
---
 .../recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc0.inc   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc0.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc0.inc
index 555fb1d..d22108a 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc0.inc
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc0.inc
@@ -2,8 +2,6 @@
 
 # Intermediate SHA with 2.3 baseline version
 SRCREV_tfa = "2fe7d18b0d99fdf4c4dbf84863bb2036dfebc537"
-# mbedtls-2.16.4 tag commit
-SRCREV_mbedtls = "39e2c0eeb6501980764793e8d54c49c0a42bde48"
 
 SRC_URI_append = " ${SRC_URI_MBEDTLS}"
 
-- 
2.17.1

Re: [meta-arm] [PATCH 1/2] meta-arm: trusted-firmware-a: add branch name for mbedtls

[Jon Mason]

It appears that these do not apply cleanly to the master branch.  I'm
not sure if it is the SMTP issue or something else.  Can you please
rebase and resend?

Thanks,
Jon


On Wed, Aug 05, 2020 at 11:16:28AM +0100, Usama Arif wrote:
> It appears that the mbedtls team have moved the SHA which
> meta-arm was using from master branch. It is still present
> in mbedtls-2.18 branch so this is now used.
> 
> Change-Id: Ie932f446067767e85a25583b1bdc02b4739e323f
> Signed-off-by: Usama Arif <usama.arif@arm.com>
> Signed-off-by: Prabin CA <prabin.ca@rm.com>
> ---
>  .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb    | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
> index 8286b64..7279173 100644
> --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
> +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
> @@ -21,7 +21,7 @@ LIC_FILES_CHKSUM = "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89
>  # 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"
> +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=mbedtls-2.18"
>  
>  # mbed TLS v2.18.1
>  SRCREV_mbedtls = "ca933c7e0c9e84738b168b6b0feb89af4183a60a"
> -- 
> 2.17.1
> 

> 

Re: [meta-arm] [PATCH 1/2] meta-arm: trusted-firmware-a: add branch name for mbedtls

[Jon Mason]

On Fri, Aug 07, 2020 at 04:57:39PM -0400, Jon Mason via lists.yoctoproject.org wrote:
> It appears that these do not apply cleanly to the master branch.  I'm
> not sure if it is the SMTP issue or something else.  Can you please
> rebase and resend?

Disregard, I see the new versions now.

Thanks,
Jon

> 
> Thanks,
> Jon
> 
> 
> On Wed, Aug 05, 2020 at 11:16:28AM +0100, Usama Arif wrote:
> > It appears that the mbedtls team have moved the SHA which
> > meta-arm was using from master branch. It is still present
> > in mbedtls-2.18 branch so this is now used.
> > 
> > Change-Id: Ie932f446067767e85a25583b1bdc02b4739e323f
> > Signed-off-by: Usama Arif <usama.arif@arm.com>
> > Signed-off-by: Prabin CA <prabin.ca@rm.com>
> > ---
> >  .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb    | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
> > index 8286b64..7279173 100644
> > --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
> > +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
> > @@ -21,7 +21,7 @@ LIC_FILES_CHKSUM = "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89
> >  # 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"
> > +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=mbedtls-2.18"
> >  
> >  # mbed TLS v2.18.1
> >  SRCREV_mbedtls = "ca933c7e0c9e84738b168b6b0feb89af4183a60a"
> > -- 
> > 2.17.1
> > 
> 
> > 
> 

>