1
0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-06-01 01:00:15 +00:00

arm/scp-firmware: rationalise SRCREV/bbappends

In "scp-firmware: allow setting log level to INFO or WARN"[1] the base
SRCREV was bumped from db1991 (the 2.6 tag) to fd7c8356. This means a
fair amount of cleanup can be made:

The base recipe should set PV=2.6+git, both of the existing bbappends
already did this so those can be removed.

The base recipe's CMSIS SRCREV should be a SHA, not a tag name. Both
bbappends also did this so those can be removed.

The TC0 SRCREV is in fact earlier than the new base recipe, so remove
the override so unify the versions. There were no TC-specific changes
between the two SHAs so this should be safe.

[1] 9386db13df

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Ross Burton
2023-01-09 14:41:29 +00:00
committed by Jon Mason
parent 58dbad789d
commit a07dec8ad8
3 changed files with 2 additions and 12 deletions
@@ -1,14 +1,10 @@
# N1SDP specific SCP configurations and build instructions
SRCREV_scp = "fd7c83561a7d76c7681d5d017fb23aa3664c028c"
SRCREV_cmsis = "refs/tags/5.2.0"
SCP_PLATFORM = "n1sdp"
SCP_LOG_LEVEL = "INFO"
COMPATIBLE_MACHINE_n1sdp = "n1sdp"
PV = "2.6+git${SRCPV}"
DEPENDS += "fiptool-native"
DEPENDS += "virtual/trusted-firmware-a"
@@ -1,13 +1,6 @@
# TC0 specicif SCP configuration
# Intermediate SHA with 2.6 baseline version
SRCREV_scp = "ba1db5fb0ee4a520836722f7a694177d461ab716"
# 5.2.0 tag commit
SRCREV_cmsis = "80cc44bba16cb4c8f495b7aa9709d41ac50e9529"
COMPATIBLE_MACHINE = "tc0"
SCP_PLATFORM = "tc0"
FW_TARGETS = "scp"
PV = "2.6+git${SRCPV}"