| Message ID | 20230109144130.1399220-1-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [dunfell,1/2] arm/scp-firmware: rationalise SRCREV/bbappends | expand |
On Mon, 9 Jan 2023 14:41:29 +0000, Ross Burton wrote: > 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. > > [...] Applied, thanks! [1/2] arm/scp-firmware: rationalise SRCREV/bbappends commit: a07dec8ad8a260f293a55e8300f514dee134b2d6 [2/2] arm/scp-firmware: backport a build race fix commit: d13be36099aff7ea2975a1a197564e2e801707a3 Best regards,
On Mon, 9 Jan 2023 14:41:29 +0000, Ross Burton wrote: > 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. > > [...] Applied, thanks! [1/2] arm/scp-firmware: rationalise SRCREV/bbappends commit: a07dec8ad8a260f293a55e8300f514dee134b2d6 [2/2] arm/scp-firmware: backport a build race fix commit: d13be36099aff7ea2975a1a197564e2e801707a3 Best regards,
On Mon, 9 Jan 2023 14:41:29 +0000, Ross Burton wrote: > 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. > > [...] Applied, thanks! [1/2] arm/scp-firmware: rationalise SRCREV/bbappends commit: a07dec8ad8a260f293a55e8300f514dee134b2d6 [2/2] arm/scp-firmware: backport a build race fix commit: d13be36099aff7ea2975a1a197564e2e801707a3 Best regards,
diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc index ddbaac4a..495f1ed6 100644 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc @@ -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" diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc0.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc0.inc index 5b29305b..7df09338 100644 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc0.inc +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc0.inc @@ -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}" diff --git a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_git.bb b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_git.bb index 9cb8b642..92c82c58 100644 --- a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_git.bb +++ b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_git.bb @@ -13,8 +13,9 @@ SRC_URI = "\ git://github.com/ARM-software/CMSIS_5.git;protocol=https;name=cmsis;destsuffix=src/cmsis;lfs=0;nobranch=1 \ " +PV = "2.6+git${SRCPV}" SRCREV_scp = "fd7c83561a7d76c7681d5d017fb23aa3664c028c" -SRCREV_cmsis = "refs/tags/5.2.0" +SRCREV_cmsis = "80cc44bba16cb4c8f495b7aa9709d41ac50e9529" SRCREV_FORMAT = "scp_cmsis" require scp-firmware.inc
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] 9386db13df5134ab68ae3a1618e999584f7a4261 Signed-off-by: Ross Burton <ross.burton@arm.com> --- .../recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc | 4 ---- meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc0.inc | 7 ------- meta-arm/recipes-bsp/scp-firmware/scp-firmware_git.bb | 3 ++- 3 files changed, 2 insertions(+), 12 deletions(-)