[meta-arm,2/2] arm-bsp/trusted-firmware-a: Add v2.3 support for juno platform

Submitted by Damodar Santhapuri on Aug. 10, 2020, 3:02 a.m. | Patch ID: 175168

Details

Message ID 20200810030216.24798-2-damodar.santhapuri@arm.com
State New
Headers show

Commit Message

Damodar Santhapuri Aug. 10, 2020, 3:02 a.m.
Update machine/juno.conf to support tf-a v2.3

Change-Id: Ieced15e83818687c879d927bce2c4604a72b9b1e
Signed-off-by: Damodar Santhapuri <damodar.santhapuri@arm.com>
---
 meta-arm-bsp/conf/machine/juno.conf                         | 2 +-
 .../trusted-firmware-a/trusted-firmware-a-juno.inc          | 2 +-
 .../trusted-firmware-a/trusted-firmware-a_2.1.bbappend      | 6 ------
 .../trusted-firmware-a/trusted-firmware-a_2.3.bbappend      | 1 +
 4 files changed, 3 insertions(+), 8 deletions(-)
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend

Patch hide | download patch | download mbox

diff --git a/meta-arm-bsp/conf/machine/juno.conf b/meta-arm-bsp/conf/machine/juno.conf
index 898a863..5f74535 100644
--- a/meta-arm-bsp/conf/machine/juno.conf
+++ b/meta-arm-bsp/conf/machine/juno.conf
@@ -20,7 +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%"
+PREFERRED_VERSION_trusted-firmware-a ?= "2.3%"
 
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot firmware-image-juno"
 
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc
index a6d8ded..c685d7d 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc
@@ -5,7 +5,7 @@  TFA_PLATFORM = "juno"
 TFA_DEBUG = "1"
 TFA_MBEDTLS = "1"
 TFA_UBOOT = "1"
-TFA_BUILD_TARGET = "bl1 fip"
+TFA_BUILD_TARGET = "bl1 bl2 bl31 fip dtbs"
 
 # Juno needs the System Control Processor Firmware
 DEPENDS += "virtual/control-processor-firmware"
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend
deleted file mode 100644
index f5f1632..0000000
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@ 
-# Machine specific TFAs
-
-MACHINE_TFA_REQUIRE ?= ""
-MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc"
-
-require ${MACHINE_TFA_REQUIRE}
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend
index 6f67b49..8743ec5 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend
@@ -6,5 +6,6 @@  MACHINE_TFA_REQUIRE_a5ds = "trusted-firmware-a-a5ds.inc"
 MACHINE_TFA_REQUIRE_foundation-armv8 = "trusted-firmware-a-fvp.inc"
 MACHINE_TFA_REQUIRE_fvp-base = "trusted-firmware-a-fvp.inc"
 MACHINE_TFA_REQUIRE_n1sdp = "trusted-firmware-a-n1sdp.inc"
+MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc"
 
 require ${MACHINE_TFA_REQUIRE}

Comments

Denys Dmytriyenko Aug. 10, 2020, 3:24 p.m.
On Mon, Aug 10, 2020 at 08:32:16AM +0530, Damodar Santhapuri wrote:
> Update machine/juno.conf to support tf-a v2.3
> 
> Change-Id: Ieced15e83818687c879d927bce2c4604a72b9b1e
> Signed-off-by: Damodar Santhapuri <damodar.santhapuri@arm.com>
> ---
>  meta-arm-bsp/conf/machine/juno.conf                         | 2 +-
>  .../trusted-firmware-a/trusted-firmware-a-juno.inc          | 2 +-
>  .../trusted-firmware-a/trusted-firmware-a_2.1.bbappend      | 6 ------
>  .../trusted-firmware-a/trusted-firmware-a_2.3.bbappend      | 1 +
>  4 files changed, 3 insertions(+), 8 deletions(-)
>  delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend
> 
> diff --git a/meta-arm-bsp/conf/machine/juno.conf b/meta-arm-bsp/conf/machine/juno.conf
> index 898a863..5f74535 100644
> --- a/meta-arm-bsp/conf/machine/juno.conf
> +++ b/meta-arm-bsp/conf/machine/juno.conf
> @@ -20,7 +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%"
> +PREFERRED_VERSION_trusted-firmware-a ?= "2.3%"
>  
>  EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot firmware-image-juno"
>  
> diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc
> index a6d8ded..c685d7d 100644
> --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc
> +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc
> @@ -5,7 +5,7 @@ TFA_PLATFORM = "juno"
>  TFA_DEBUG = "1"
>  TFA_MBEDTLS = "1"
>  TFA_UBOOT = "1"
> -TFA_BUILD_TARGET = "bl1 fip"
> +TFA_BUILD_TARGET = "bl1 bl2 bl31 fip dtbs"

I was wondering - why these TFA_* variables can't be set in the corresponding 
machine config file, instead of creating these trusted-firmware-a-<machine>.inc 
include files?


>  # Juno needs the System Control Processor Firmware
>  DEPENDS += "virtual/control-processor-firmware"
> diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend
> deleted file mode 100644
> index f5f1632..0000000
> --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -# Machine specific TFAs
> -
> -MACHINE_TFA_REQUIRE ?= ""
> -MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc"
> -
> -require ${MACHINE_TFA_REQUIRE}
> diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend
> index 6f67b49..8743ec5 100644
> --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend
> +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend
> @@ -6,5 +6,6 @@ MACHINE_TFA_REQUIRE_a5ds = "trusted-firmware-a-a5ds.inc"
>  MACHINE_TFA_REQUIRE_foundation-armv8 = "trusted-firmware-a-fvp.inc"
>  MACHINE_TFA_REQUIRE_fvp-base = "trusted-firmware-a-fvp.inc"
>  MACHINE_TFA_REQUIRE_n1sdp = "trusted-firmware-a-n1sdp.inc"
> +MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc"
>  
>  require ${MACHINE_TFA_REQUIRE}
> -- 
> 2.17.1
> 

>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#1011): https://lists.yoctoproject.org/g/meta-arm/message/1011
Mute This Topic: https://lists.yoctoproject.org/mt/76097905/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Ross Burton Aug. 10, 2020, 8:40 p.m.
Some, yes, probably.  Others need a separate file as they do more,
like the a5ds file:

EXTRA_OEMAKE_append = " \
                    ARCH=aarch32 \
                    FVP_HW_CONFIG_DTS=fdts/a5ds.dts \
                    ARM_ARCH_MAJOR=7 \
                    AARCH32_SP=sp_min \
                    ARM_CORTEX_A5=yes \
                    ARM_XLAT_TABLES_LIB_V1=1 \
                    "

It would be awesome if TFA just built with a few variables, but right
now that's not the case.

Ross

On Mon, 10 Aug 2020 at 16:24, Denys Dmytriyenko <denis@denix.org> wrote:
>
> On Mon, Aug 10, 2020 at 08:32:16AM +0530, Damodar Santhapuri wrote:
> > Update machine/juno.conf to support tf-a v2.3
> >
> > Change-Id: Ieced15e83818687c879d927bce2c4604a72b9b1e
> > Signed-off-by: Damodar Santhapuri <damodar.santhapuri@arm.com>
> > ---
> >  meta-arm-bsp/conf/machine/juno.conf                         | 2 +-
> >  .../trusted-firmware-a/trusted-firmware-a-juno.inc          | 2 +-
> >  .../trusted-firmware-a/trusted-firmware-a_2.1.bbappend      | 6 ------
> >  .../trusted-firmware-a/trusted-firmware-a_2.3.bbappend      | 1 +
> >  4 files changed, 3 insertions(+), 8 deletions(-)
> >  delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend
> >
> > diff --git a/meta-arm-bsp/conf/machine/juno.conf b/meta-arm-bsp/conf/machine/juno.conf
> > index 898a863..5f74535 100644
> > --- a/meta-arm-bsp/conf/machine/juno.conf
> > +++ b/meta-arm-bsp/conf/machine/juno.conf
> > @@ -20,7 +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%"
> > +PREFERRED_VERSION_trusted-firmware-a ?= "2.3%"
> >
> >  EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot firmware-image-juno"
> >
> > diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc
> > index a6d8ded..c685d7d 100644
> > --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc
> > +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc
> > @@ -5,7 +5,7 @@ TFA_PLATFORM = "juno"
> >  TFA_DEBUG = "1"
> >  TFA_MBEDTLS = "1"
> >  TFA_UBOOT = "1"
> > -TFA_BUILD_TARGET = "bl1 fip"
> > +TFA_BUILD_TARGET = "bl1 bl2 bl31 fip dtbs"
>
> I was wondering - why these TFA_* variables can't be set in the corresponding
> machine config file, instead of creating these trusted-firmware-a-<machine>.inc
> include files?
>
>
> >  # Juno needs the System Control Processor Firmware
> >  DEPENDS += "virtual/control-processor-firmware"
> > diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend
> > deleted file mode 100644
> > index f5f1632..0000000
> > --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bbappend
> > +++ /dev/null
> > @@ -1,6 +0,0 @@
> > -# Machine specific TFAs
> > -
> > -MACHINE_TFA_REQUIRE ?= ""
> > -MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc"
> > -
> > -require ${MACHINE_TFA_REQUIRE}
> > diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend
> > index 6f67b49..8743ec5 100644
> > --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend
> > +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend
> > @@ -6,5 +6,6 @@ MACHINE_TFA_REQUIRE_a5ds = "trusted-firmware-a-a5ds.inc"
> >  MACHINE_TFA_REQUIRE_foundation-armv8 = "trusted-firmware-a-fvp.inc"
> >  MACHINE_TFA_REQUIRE_fvp-base = "trusted-firmware-a-fvp.inc"
> >  MACHINE_TFA_REQUIRE_n1sdp = "trusted-firmware-a-n1sdp.inc"
> > +MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc"
> >
> >  require ${MACHINE_TFA_REQUIRE}
> > --
> > 2.17.1
> >
>
> >
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#1012): https://lists.yoctoproject.org/g/meta-arm/message/1012
Mute This Topic: https://lists.yoctoproject.org/mt/76097905/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-