Skip to contentSkip to conversation

trusted-firmware-a: Update to v2.4 merge

PATCH Superseded Nishanth Menon 2 participants 5 messages Dec 10, 2020 – Dec 11, 2020

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 trusted-firmware-a: Update to v2.4 merge

Update to v2.4 tag merge from upstream to keep TF-A in sync.

For major changes in trusted-firmware-a, See:
https://trustedfirmware-a.readthedocs.io/en/latest/change-log.html#version-2-4

TI specific fixups include:
- stub for shutdown (CPUs enter wfi)
- uart console is now configurable.

While at it, update to include PV_k3 as 2.4 and provide the license file checksum.

NOTE: We use PV_k3 instead of PV since this allows meta-ti to not affect other platforms esp in a multi-BSP configuration.

---
Changes since v3:
- s/LIC_FILES_CHKSUM/LIC_FILES_CHKSUM_k3 coming right up..

Changes since v2:
- Update license file and checksum (Thanks Dan for catching my next blunder)

Changes since v1 in v2:
- Update for PV_k3 (Thanks Denys) - I was'nt sure to pick a "Reviewed-by" tag for your LGTM :).. so did'nt want to guess.

 recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +3 -1
index 3c1862643086..c561fe2d7e76 100644
@@ -1,6 +1,8 @@
+PV_k3 = "2.4"
+LIC_FILES_CHKSUM_k3 = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
 BRANCH_k3 = "ti-atf"
 SRC_URI_k3 = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH};name=tfa"
-SRCREV_tfa_k3 = "52c334fc361194e3896ea3b2529c10a06e586a5f"
+SRCREV_tfa_k3 = "f0a310d000fd6e8a1ed0ccc365b5931390393db1"
 COMPATIBLE_MACHINE_k3 = "k3"
 TFA_BUILD_TARGET_k3 = "all"
 TFA_INSTALL_TARGET_k3 = "bl31"
Signature · 1 line
2.25.1.377.g2d2118b814c1
Reviewed-by on v4 1/1
#1 lore raw
Quoted 9 lines · Nishanth Menon

Update to v2.4 tag merge from upstream to keep TF-A in sync.

For major changes in trusted-firmware-a, See:
https://trustedfirmware-a.readthedocs.io/en/latest/change-log.html#version-2-4

TI specific fixups include:
- stub for shutdown (CPUs enter wfi)
- uart console is now configurable.

Quoted 8 lines

While at it, update to include PV_k3 as 2.4 and provide the license file checksum.

NOTE: We use PV_k3 instead of PV since this allows meta-ti to not affect other platforms esp in a multi-BSP configuration.

Nice-to-have would be to explain the license checksum change and whether it affects the actual license. The checksum there is specifically to catch any changes to the license file and prevent re-licensing to pass unnoticed...

Quoted 31 lines

---
Changes since v3:
- s/LIC_FILES_CHKSUM/LIC_FILES_CHKSUM_k3 coming right up..

Changes since v2:
- Update license file and checksum (Thanks Dan for catching my next blunder)

Changes since v1 in v2:
- Update for PV_k3 (Thanks Denys) - I was'nt sure to pick a "Reviewed-by" tag for your LGTM :).. so did'nt want to guess.

 recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +3 -1
index 3c1862643086..c561fe2d7e76 100644
@@ -1,6 +1,8 @@
+PV_k3 = "2.4"
+LIC_FILES_CHKSUM_k3 = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
 BRANCH_k3 = "ti-atf"
 SRC_URI_k3 = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH};name=tfa"
-SRCREV_tfa_k3 = "52c334fc361194e3896ea3b2529c10a06e586a5f"
+SRCREV_tfa_k3 = "f0a310d000fd6e8a1ed0ccc365b5931390393db1"
 COMPATIBLE_MACHINE_k3 = "k3"
 TFA_BUILD_TARGET_k3 = "all"
 TFA_INSTALL_TARGET_k3 = "bl31"
Signature · 1 line
2.25.1.377.g2d2118b814c1
Signature · 4 lines
Regards,
Denys Dmytriyenko <[email protected]>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964
#2 lore raw
Quoted 16 lines · Denys Dmytriyenko
Quoted 15 lines · Nishanth Menon

Update to v2.4 tag merge from upstream to keep TF-A in sync.

For major changes in trusted-firmware-a, See:
https://trustedfirmware-a.readthedocs.io/en/latest/change-log.html#version-2-4

TI specific fixups include:
- stub for shutdown (CPUs enter wfi)
- uart console is now configurable.

While at it, update to include PV_k3 as 2.4 and provide the license file checksum.

NOTE: We use PV_k3 instead of PV since this allows meta-ti to not affect other platforms esp in a multi-BSP configuration.

Quoted 9 lines
Quoted 2 lines

Nice-to-have would be to explain the license checksum change and whether it affects the actual license. The checksum there is specifically to catch any changes to the license file and prevent re-licensing to pass unnoticed...

Hmm.. good idea.. but it was'nt present before.. so i could state something as follows in the commit message:

----

While at it, update to include PV_k3 as 2.4. We use PV_k3 instead of PV since this allows meta-ti to not affect other platforms esp in a multi-BSP configuration.

We also add LIC_FILES_CHKSUM_k3 to make sure that we don't let any re-licensing in the project pass through unnoticed as that has to be carefully examined for making sure we have all the right legal compliance.

----

If good, I can repost with your reviewed-by plucked up..

Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D
#3 lore raw
Quoted 32 lines · Nishanth Menon
Quoted 16 lines · Denys Dmytriyenko
Quoted 15 lines · Nishanth Menon

Update to v2.4 tag merge from upstream to keep TF-A in sync.

For major changes in trusted-firmware-a, See:
https://trustedfirmware-a.readthedocs.io/en/latest/change-log.html#version-2-4

TI specific fixups include:
- stub for shutdown (CPUs enter wfi)
- uart console is now configurable.

While at it, update to include PV_k3 as 2.4 and provide the license file checksum.

NOTE: We use PV_k3 instead of PV since this allows meta-ti to not affect other platforms esp in a multi-BSP configuration.

Quoted 9 lines
Quoted 2 lines

Nice-to-have would be to explain the license checksum change and whether it affects the actual license. The checksum there is specifically to catch any changes to the license file and prevent re-licensing to pass unnoticed...

Hmm.. good idea.. but it was'nt present before.. so i could state something as follows in the commit message:

----

Quoted 8 lines

While at it, update to include PV_k3 as 2.4. We use PV_k3 instead of PV since this allows meta-ti to not affect other platforms esp in a multi-BSP configuration.

We also add LIC_FILES_CHKSUM_k3 to make sure that we don't let any re-licensing in the project pass through unnoticed as that has to be carefully examined for making sure we have all the right legal compliance.

Right, but you don't explain what actually changed to cause the checksum update...

E.g.: "checksum changed due to upstream commit XYZ to update the year, the license itself is the same" or "checksum changed due to addition on SPDX header in commit XYZ, no license change"

But you need to examine it yourself. Otherwise it could be: "the license has changed from GPLv2 to GPLv3" and also update the actual LICENSE_k3 variable.

Quoted 9 lines

----

If good, I can repost with your reviewed-by plucked up..

Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D
Signature · 4 lines
Regards,
Denys Dmytriyenko <[email protected]>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964
#4 lore raw
Quoted 45 lines · Denys Dmytriyenko
Quoted 32 lines · Nishanth Menon
Quoted 16 lines · Denys Dmytriyenko
Quoted 15 lines · Nishanth Menon

Update to v2.4 tag merge from upstream to keep TF-A in sync.

For major changes in trusted-firmware-a, See:
https://trustedfirmware-a.readthedocs.io/en/latest/change-log.html#version-2-4

TI specific fixups include:
- stub for shutdown (CPUs enter wfi)
- uart console is now configurable.

While at it, update to include PV_k3 as 2.4 and provide the license file checksum.

NOTE: We use PV_k3 instead of PV since this allows meta-ti to not affect other platforms esp in a multi-BSP configuration.

Quoted 9 lines
Quoted 2 lines

Nice-to-have would be to explain the license checksum change and whether it affects the actual license. The checksum there is specifically to catch any changes to the license file and prevent re-licensing to pass unnoticed...

Hmm.. good idea.. but it was'nt present before.. so i could state something as follows in the commit message:

----

Quoted 8 lines

While at it, update to include PV_k3 as 2.4. We use PV_k3 instead of PV since this allows meta-ti to not affect other platforms esp in a multi-BSP configuration.

We also add LIC_FILES_CHKSUM_k3 to make sure that we don't let any re-licensing in the project pass through unnoticed as that has to be carefully examined for making sure we have all the right legal compliance.

Right, but you don't explain what actually changed to cause the checksum update...

Quoted 6 lines

E.g.: "checksum changed due to upstream commit XYZ to update the year, the license itself is the same" or "checksum changed due to addition on SPDX header in commit XYZ, no license change"

But you need to examine it yourself. Otherwise it could be: "the license has changed from GPLv2 to GPLv3" and also update the actual LICENSE_k3 variable.

I did check..

https://github.com/ARM-software/arm-trusted-firmware/commits/master/license.rst

There is nothing changed since the original inception other than document optimization, definitely nothing since commit 52c334fc361194e3896ea3b2529c10a06e586a5f

So, how about this reword:
----

While at it, update to include PV_k3 as 2.4. We use PV_k3 instead of PV since this allows meta-ti to not affect other platforms esp in a multi-BSP configuration.

We also add LIC_FILES_CHKSUM_k3 to make sure that we don't let any re-licensing in the project pass through unnoticed as that has to be carefully examined for making sure we have all the right legal compliance - There has been no change compared to previous versions, but we introduce this as a protection in case there is a change in the future.

Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D