CLASS-DEVUPSTREAM: fix usage

- Split properly between tf-a-stm32mp and tf-a-stm32mp-ssp.
- Remove use of PV_class-devupstream: no more needed since we avoid using
SRCPV inside default PV (this avoid also misalignment with PV when updated).
- Fix missing fragment files for linux-stm32mp when devupstream in use.

Signed-off-by: Romuald JEANNE <romuald.jeanne@st.com>
Change-Id: I57ed371c9eefce6dc31d816508e99c576a7db91a

recipes-bsp/trusted-firmware-a/tf-a-stm32mp-common_2.2.inc

@@ -16,20 +16,3 @@ TF_VERSION = "2.2"
 PV = "${TF_VERSION}.r1"
 
 S = "${WORKDIR}/git"
-
-# ---------------------------------
-# Configure devupstream class usage
-# ---------------------------------
-BBCLASSEXTEND = "devupstream:target"
-
-SRC_URI_class-devupstream ?= "git://github.com/STMicroelectronics/arm-trusted-firmware.git;protocol=https;name=tfa;branch=v${TF_VERSION}-stm32mp"
-SRCREV_class-devupstream ?= "e587179e7b0823b5c6e38e029e417d10f088db51"
-SRCREV_FORMAT_class-devupstream = "tfa"
-PV_class-devupstream = "${TF_VERSION}+github+${SRCPV}"
-
-# ---------------------------------
-# Configure default preference to manage dynamic selection between tarball and github
-# ---------------------------------
-STM32MP_SOURCE_SELECTION ?= "tarball"
-
-DEFAULT_PREFERENCE = "${@bb.utils.contains('STM32MP_SOURCE_SELECTION', 'github', '-1', '1', d)}"

recipes-bsp/trusted-firmware-a/tf-a-stm32mp-ssp_2.2.bb

@@ -31,5 +31,14 @@ include ${@oe.utils.ifelse(d.getVar('ST_ARCHIVER_ENABLE') == '1', 'tf-a-stm32mp-
 # ---------------------------------
 # Configure devupstream class usage
 # ---------------------------------
-SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/arm-trusted-firmware.git;protocol=https;name=tfa;branch=v${TF_VERSION}-stm32mp-ssp"
+BBCLASSEXTEND = "devupstream:target"
+
+SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/arm-trusted-firmware.git;protocol=https;branch=v${TF_VERSION}-stm32mp-ssp"
 SRCREV_class-devupstream = "3a5830ccfbcebfaa60540d50d42f0e37f3b532e9"
+
+# ---------------------------------
+# Configure default preference to manage dynamic selection between tarball and github
+# ---------------------------------
+STM32MP_SOURCE_SELECTION ?= "tarball"
+
+DEFAULT_PREFERENCE = "${@bb.utils.contains('STM32MP_SOURCE_SELECTION', 'github', '-1', '1', d)}"

recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.2.bb

@@ -24,3 +24,18 @@ TF_A_ENABLE_DEBUG_WRAPPER ?= "1"
 # Configure archiver use
 # ---------------------------------
 include ${@oe.utils.ifelse(d.getVar('ST_ARCHIVER_ENABLE') == '1', 'tf-a-stm32mp-archiver.inc','')}
+
+# ---------------------------------
+# Configure devupstream class usage
+# ---------------------------------
+BBCLASSEXTEND = "devupstream:target"
+
+SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/arm-trusted-firmware.git;protocol=https;branch=v${TF_VERSION}-stm32mp"
+SRCREV_class-devupstream = "e587179e7b0823b5c6e38e029e417d10f088db51"
+
+# ---------------------------------
+# Configure default preference to manage dynamic selection between tarball and github
+# ---------------------------------
+STM32MP_SOURCE_SELECTION ?= "tarball"
+
+DEFAULT_PREFERENCE = "${@bb.utils.contains('STM32MP_SOURCE_SELECTION', 'github', '-1', '1', d)}"

recipes-bsp/u-boot/u-boot-stm32mp-common_2020.01.inc

@@ -34,10 +34,8 @@ S = "${WORKDIR}/git"
 # ---------------------------------
 BBCLASSEXTEND = "devupstream:target"
 
-SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/u-boot.git;name=uboot;protocol=https;branch=v${U_BOOT_VERSION}-stm32mp"
+SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/u-boot.git;protocol=https;branch=v${U_BOOT_VERSION}-stm32mp"
 SRCREV_class-devupstream = "764fc8b2591139fb6a729516ccb4f9836b310d63"
-SRCREV_FORMAT_class-devupstream = "uboot"
-PV_class-devupstream = "${U_BOOT_VERSION}+github+${SRCPV}"
 
 # ---------------------------------
 # Configure default preference to manage dynamic selection between tarball and github

recipes-kernel/linux/linux-stm32mp_5.4.bb

@@ -45,10 +45,8 @@ S = "${WORKDIR}/linux-${LINUX_VERSION}.${LINUX_SUBVERSION}"
 # ---------------------------------
 BBCLASSEXTEND = "devupstream:target"
 
-SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/linux.git;protocol=https;branch=v${LINUX_VERSION}-stm32mp;name=linux"
+SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/linux.git;protocol=https;branch=v${LINUX_VERSION}-stm32mp"
 SRCREV_class-devupstream = "b8663f5fdb5cfd6f243b72c9fac82c24b2594294"
-SRCREV_FORMAT_class-devupstream = "linux"
-PV_class-devupstream = "${LINUX_VERSION}+github+${SRCPV}"
 
 # ---------------------------------
 # Configure default preference to manage dynamic selection between tarball and github
@@ -79,9 +77,10 @@ SRC_URI += "file://${LINUX_VERSION}/fragment-05-modules.config;subdir=fragments"
 SRC_URI += "file://${LINUX_VERSION}/fragment-06-signature.config;subdir=fragments"
 
 # Don't forget to add/del for devupstream
-#SRC_URI_class-devupstream += " file://${LINUX_VERSION}/fragment-03-systemd.config;subdir=fragments "
+SRC_URI_class-devupstream += "file://${LINUX_VERSION}/fragment-03-systemd.config;subdir=fragments"
-#SRC_URI_class-devupstream += " file://${LINUX_VERSION}/fragment-04-optee.config;subdir=fragments "
+SRC_URI_class-devupstream += "file://${LINUX_VERSION}/fragment-04-optee.config;subdir=fragments"
-#SRC_URI_class-devupstream += " file://${LINUX_VERSION}/fragment-05-modules.config;subdir=fragments "
+SRC_URI_class-devupstream += "file://${LINUX_VERSION}/fragment-05-modules.config;subdir=fragments"
+SRC_URI_class-devupstream += "file://${LINUX_VERSION}/fragment-06-signature.config;subdir=fragments"
 
 # -------------------------------------------------------------
 # Kernel Args

recipes-security/optee/optee-os-stm32mp_3.9.0.bb

@@ -2,7 +2,7 @@ SUMMARY = "OPTEE TA development kit for stm32mp"
 LICENSE = "BSD-2-Clause & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173"
 
-SRC_URI = "git://github.com/OP-TEE/optee_os.git;protocol=https;name=os"
+SRC_URI = "git://github.com/OP-TEE/optee_os.git;protocol=https"
 SRCREV = "af141c61fe7a2430f3b4bb89661d8414117013b3"
 
 SRC_URI += " \
@@ -38,10 +38,8 @@ include ${@oe.utils.ifelse(d.getVar('ST_ARCHIVER_ENABLE') == '1', 'optee-os-stm3
 # ---------------------------------
 BBCLASSEXTEND = "devupstream:target"
 
-SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/optee_os.git;protocol=https;name=opteeos;branch=${OPTEE_VERSION}-stm32mp"
+SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/optee_os.git;protocol=https;branch=${OPTEE_VERSION}-stm32mp"
 SRCREV_class-devupstream = "dbfbd96e5850747842b008b54e7d2be171c6d83f"
-SRCREV_FORMAT_class-devupstream = "opteeos"
-PV_class-devupstream = "${OPTEE_VERSION}+github+${SRCPV}"
 
 # ---------------------------------
 # Configure default preference to manage dynamic selection between tarball and github