Message ID | 20220629133650.21058-1-jon.mason@arm.com |
---|---|
State | New |
Headers | show |
Series | arm/trusted-firmware-a: Fix v1.5 recipe | expand |
On Wed, Jun 29, 2022 at 09:36:50AM -0400, Jon Mason wrote: > 0003-xlat-tables-v2-remove-tautological-assert.patch does not apply on > the TF-A v1.5 sources. Move that file append to the v2.4 recipe so that > it will not attempt to apply for v1.5. > > Signed-off-by: Jon Mason <jon.mason@arm.com> > --- > meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc | 1 - > .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb | 2 ++ > 2 files changed, 2 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 807e1254..cea5476a 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 > @@ -57,7 +57,6 @@ SRCREV_FORMAT_append = "${@bb.utils.contains('TFA_MBEDTLS', '1', '_mbedtls', '', > > SRC_URI_append = " \ > file://0002-pmf.h-made-PMF_STOTE_ENABLE-pass-Wtautological.patch \ > - file://0003-xlat-tables-v2-remove-tautological-assert.patch \ > " > > # U-boot support (set TFA_UBOOT to 1 to activate) > diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb > index f23132af..d8e87405 100644 > --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb > +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb > @@ -13,3 +13,5 @@ SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=ht > SRCREV_mbedtls = "523f0554b6cdc7ace5d360885c3f5bbcc73ec0e8" > > LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" > + > +SRC_URI_append = "file://0003-xlat-tables-v2-remove-tautological-assert.patch" 1. missing leading space in append override 2. old override syntax - what branch is it, master?
On Wed, Jul 06, 2022 at 01:59:14PM -0400, Denys Dmytriyenko wrote: > On Wed, Jun 29, 2022 at 09:36:50AM -0400, Jon Mason wrote: > > 0003-xlat-tables-v2-remove-tautological-assert.patch does not apply on > > the TF-A v1.5 sources. Move that file append to the v2.4 recipe so that > > it will not attempt to apply for v1.5. > > > > Signed-off-by: Jon Mason <jon.mason@arm.com> > > --- > > meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc | 1 - > > .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb | 2 ++ > > 2 files changed, 2 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 807e1254..cea5476a 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 > > @@ -57,7 +57,6 @@ SRCREV_FORMAT_append = "${@bb.utils.contains('TFA_MBEDTLS', '1', '_mbedtls', '', > > > > SRC_URI_append = " \ > > file://0002-pmf.h-made-PMF_STOTE_ENABLE-pass-Wtautological.patch \ > > - file://0003-xlat-tables-v2-remove-tautological-assert.patch \ > > " > > > > # U-boot support (set TFA_UBOOT to 1 to activate) > > diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb > > index f23132af..d8e87405 100644 > > --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb > > +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb > > @@ -13,3 +13,5 @@ SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=ht > > SRCREV_mbedtls = "523f0554b6cdc7ace5d360885c3f5bbcc73ec0e8" > > > > LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" > > + > > +SRC_URI_append = "file://0003-xlat-tables-v2-remove-tautological-assert.patch" > > 1. missing leading space in append override Good catch. Weird that CI didn't catch it. > 2. old override syntax - what branch is it, master? Sorry, sloppy emailing. This was for hardknott. > > -- > Denys >
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 807e1254..cea5476a 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 @@ -57,7 +57,6 @@ SRCREV_FORMAT_append = "${@bb.utils.contains('TFA_MBEDTLS', '1', '_mbedtls', '', SRC_URI_append = " \ file://0002-pmf.h-made-PMF_STOTE_ENABLE-pass-Wtautological.patch \ - file://0003-xlat-tables-v2-remove-tautological-assert.patch \ " # U-boot support (set TFA_UBOOT to 1 to activate) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb index f23132af..d8e87405 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb @@ -13,3 +13,5 @@ SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=ht SRCREV_mbedtls = "523f0554b6cdc7ace5d360885c3f5bbcc73ec0e8" LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI_append = "file://0003-xlat-tables-v2-remove-tautological-assert.patch"
0003-xlat-tables-v2-remove-tautological-assert.patch does not apply on the TF-A v1.5 sources. Move that file append to the v2.4 recipe so that it will not attempt to apply for v1.5. Signed-off-by: Jon Mason <jon.mason@arm.com> --- meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc | 1 - .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-)