[meta-arm,v2] arm/scp-firmware: use gitsm fetcher

Submitted by Ross Burton on July 30, 2020, 8:42 a.m. | Patch ID: 174897

Details

Message ID 20200730084257.1826181-1-ross@burtonini.com
State New
Headers show

Commit Message

Ross Burton July 30, 2020, 8:42 a.m.
From: Ross Burton <ross.burton@arm.com>

The standard git fetcher ignores submodules but as scp-firmware uses
submodules it should use the gitsm: fetcher to automatically fetch cmsis
instead of doing it manually.

Change-Id: I2f83100fa53070b6560be6fb7322383345224bb1
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../scp-firmware/scp-firmware_git.bb          | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

Patch hide | download patch | download mbox

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 d7d67e0..a6bfaa2 100644
--- a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_git.bb
+++ b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_git.bb
@@ -3,20 +3,11 @@  DESCRIPTION = "Firmware for SCP and MCP software reference implementation"
 HOMEPAGE = "https://github.com/ARM-software/SCP-firmware"
 
 LICENSE = "BSD-3-Clause & Apache-2.0"
+LIC_FILES_CHKSUM = "file://license.md;beginline=5;md5=9db9e3d2fb8d9300a6c3d15101b19731 \
+                    file://cmsis/LICENSE.txt;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
-# SCP
-LIC_FILES_CHKSUM = "file://license.md;beginline=5;md5=9db9e3d2fb8d9300a6c3d15101b19731"
-# CMSIS
-LIC_FILES_CHKSUM += "file://cmsis/LICENSE.txt;md5=e3fc50a88d0a364313df4b21ef20c29e"
-
-SRC_URI = "\
-    git://github.com/ARM-software/SCP-firmware.git;protocol=https;name=scp;destsuffix=src;nobranch=1 \
-    git://github.com/ARM-software/CMSIS_5.git;protocol=https;name=cmsis;destsuffix=src/cmsis;lfs=0;nobranch=1 \
-"
-
-SRCREV_scp    = "fd7c83561a7d76c7681d5d017fb23aa3664c028c"
-SRCREV_cmsis  = "refs/tags/5.2.0"
-SRCREV_FORMAT = "scp_cmsis"
+SRC_URI = "gitsm://github.com/ARM-software/SCP-firmware.git;protocol=https"
+SRCREV  = "fd7c83561a7d76c7681d5d017fb23aa3664c028c"
 
 PROVIDES += "virtual/control-processor-firmware"
 
@@ -33,7 +24,7 @@  inherit python3native
 inherit deploy
 
 B = "${WORKDIR}/build"
-S = "${WORKDIR}/src"
+S = "${WORKDIR}/git"
 
 # Allow platform specific copying of only scp or both scp & mcp, default to both
 FW_TARGETS ?= "scp mcp"