Skip to contentSkip to conversation

arm/trusted-firmware-a: Fix v1.5 recipe

PATCH In review Jon Mason 3 participants 3 messages Jul 6, 2022 – Jul 11, 2022

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/1 arm/trusted-firmware-a: Fix v1.5 recipe

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.

---
 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(-)
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +0 -1
index 807e1254..cea5476a 100644
@@ -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)
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb +2 -0
index f23132af..d8e87405 100644
@@ -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"
Signature · 1 line
2.17.1
#1 lore raw
Quoted 27 lines · Jon Mason

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.

---
 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(-)
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +0 -1
index 807e1254..cea5476a 100644
@@ -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)
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb +0 -0
index f23132af..d8e87405 100644

meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=ht · line 17

Quoted 5 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb +2 -0
@@ -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?

Signature · 1 line
Denys
#2 lore raw
Quoted 30 lines · Denys Dmytriyenko
Quoted 29 lines · Jon Mason

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.

---
 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(-)
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +0 -1
index 807e1254..cea5476a 100644
@@ -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)
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb +0 -0
index f23132af..d8e87405 100644
@@ -13,3 +13,5 @@ SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=ht
 SRCREV_mbedtls = "523f0554b6cdc7ace5d360885c3f5bbcc73ec0e8"
 
Quoted 5 lines

meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=ht · line 17

Quoted 3 lines
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bb +2 -0
 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.

Quoted 1 line

2. old override syntax - what branch is it, master?

Sorry, sloppy emailing. This was for hardknott.

Quoted 4 lines
Signature · 2 lines
-- 
Denys