From 7a1ab80ccb655e9cd28c9ea8a4a83fca48c48b11 Mon Sep 17 00:00:00 2001
From: Romuald JEANNE <romuald.jeanne@st.com>
Date: Tue, 23 Jun 2020 17:38:13 +0200
Subject: [PATCH] Enable devupstream class for TF-A, U-BOOT, OPTEE-OS and
 KERNEL

Change-Id: I07cd0ab612cd1e7f18ad26a34c2bd83608507ad6
Signed-off-by: Romuald JEANNE <romuald.jeanne@st.com>
---
 .../tf-a-stm32mp-common_2.2.inc                   | 15 ++++++++-------
 .../trusted-firmware-a/tf-a-stm32mp-ssp_2.2.bb    |  7 ++++++-
 .../u-boot/u-boot-stm32mp-common_2020.01.inc      | 14 +++++++-------
 recipes-kernel/linux/linux-stm32mp_5.4.bb         | 14 +++++++-------
 recipes-security/optee/optee-os-stm32mp_3.9.0.bb  | 14 +++++++-------
 5 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/recipes-bsp/trusted-firmware-a/tf-a-stm32mp-common_2.2.inc b/recipes-bsp/trusted-firmware-a/tf-a-stm32mp-common_2.2.inc
index fb6a2af..79c1704 100644
--- a/recipes-bsp/trusted-firmware-a/tf-a-stm32mp-common_2.2.inc
+++ b/recipes-bsp/trusted-firmware-a/tf-a-stm32mp-common_2.2.inc
@@ -20,15 +20,16 @@ S = "${WORKDIR}/git"
 # ---------------------------------
 # Configure devupstream class usage
 # ---------------------------------
-#BBCLASSEXTEND = "devupstream:target"
+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}"
 
-#SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/arm-trusted-firmware.git;protocol=https;name=tfa;branch=v2.0-stm32mp"
-#SRCREV_class-devupstream = "d0233623681124a85b069f97a447d7edb1cc1c02"
-#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"
+STM32MP_SOURCE_SELECTION ?= "tarball"
 
-#DEFAULT_PREFERENCE = "${@bb.utils.contains('STM32MP_SOURCE_SELECTION', 'github', '-1', '1', d)}"
+DEFAULT_PREFERENCE = "${@bb.utils.contains('STM32MP_SOURCE_SELECTION', 'github', '-1', '1', d)}"
diff --git a/recipes-bsp/trusted-firmware-a/tf-a-stm32mp-ssp_2.2.bb b/recipes-bsp/trusted-firmware-a/tf-a-stm32mp-ssp_2.2.bb
index bfb7486..bbaaaab 100644
--- a/recipes-bsp/trusted-firmware-a/tf-a-stm32mp-ssp_2.2.bb
+++ b/recipes-bsp/trusted-firmware-a/tf-a-stm32mp-ssp_2.2.bb
@@ -23,8 +23,13 @@ EXTRA_OEMAKE += 'ARM_ARCH_MAJOR=7'
 EXTRA_OEMAKE += 'STM32MP_UART_PROGRAMMER=1'
 EXTRA_OEMAKE += 'STM32MP_USB_PROGRAMMER=1'
 
-
 # ---------------------------------
 # Configure archiver use
 # ---------------------------------
 include ${@oe.utils.ifelse(d.getVar('ST_ARCHIVER_ENABLE') == '1', 'tf-a-stm32mp-ssp-archiver.inc','')}
+
+# ---------------------------------
+# 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"
+SRCREV_class-devupstream = "3a5830ccfbcebfaa60540d50d42f0e37f3b532e9"
diff --git a/recipes-bsp/u-boot/u-boot-stm32mp-common_2020.01.inc b/recipes-bsp/u-boot/u-boot-stm32mp-common_2020.01.inc
index 5bfead6..2b5ac82 100644
--- a/recipes-bsp/u-boot/u-boot-stm32mp-common_2020.01.inc
+++ b/recipes-bsp/u-boot/u-boot-stm32mp-common_2020.01.inc
@@ -32,16 +32,16 @@ S = "${WORKDIR}/git"
 # ---------------------------------
 # Configure devupstream class usage
 # ---------------------------------
-#BBCLASSEXTEND = "devupstream:target"
+BBCLASSEXTEND = "devupstream:target"
 
-#SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/u-boot.git;name=uboot;protocol=https;branch=v2018.11-stm32mp"
-#SRCREV_class-devupstream = "a120b9bdb3e656bb2f0485924d77d58e2281311a"
-#SRCREV_FORMAT_class-devupstream = "uboot"
-#PV_class-devupstream = "${U_BOOT_VERSION}+github+${SRCPV}"
+SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/u-boot.git;name=uboot;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
 # ---------------------------------
-#STM32MP_SOURCE_SELECTION ?= "tarball"
+STM32MP_SOURCE_SELECTION ?= "tarball"
 
-#DEFAULT_PREFERENCE = "${@bb.utils.contains('STM32MP_SOURCE_SELECTION', 'github', '-1', '1', d)}"
+DEFAULT_PREFERENCE = "${@bb.utils.contains('STM32MP_SOURCE_SELECTION', 'github', '-1', '1', d)}"
diff --git a/recipes-kernel/linux/linux-stm32mp_5.4.bb b/recipes-kernel/linux/linux-stm32mp_5.4.bb
index 8bfca00..75c959b 100644
--- a/recipes-kernel/linux/linux-stm32mp_5.4.bb
+++ b/recipes-kernel/linux/linux-stm32mp_5.4.bb
@@ -43,19 +43,19 @@ S = "${WORKDIR}/linux-${LINUX_VERSION}.${LINUX_SUBVERSION}"
 # ---------------------------------
 # Configure devupstream class usage
 # ---------------------------------
-#BBCLASSEXTEND = "devupstream:target"
+BBCLASSEXTEND = "devupstream:target"
 
-#SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/linux.git;protocol=https;branch=v${LINUX_VERSION}-stm32mp;name=linux"
-#SRCREV_class-devupstream = "196201973b7048ccf75aa63ac3c3673f8b6ee1c1"
-#SRCREV_FORMAT_class-devupstream = "linux"
-#PV_class-devupstream = "${LINUX_VERSION}+github+${SRCPV}"
+SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/linux.git;protocol=https;branch=v${LINUX_VERSION}-stm32mp;name=linux"
+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
 # ---------------------------------
-#STM32MP_SOURCE_SELECTION ?= "tarball"
+STM32MP_SOURCE_SELECTION ?= "tarball"
 
-#DEFAULT_PREFERENCE = "${@bb.utils.contains('STM32MP_SOURCE_SELECTION', 'github', '-1', '1', d)}"
+DEFAULT_PREFERENCE = "${@bb.utils.contains('STM32MP_SOURCE_SELECTION', 'github', '-1', '1', d)}"
 
 # ---------------------------------
 # Configure archiver use
diff --git a/recipes-security/optee/optee-os-stm32mp_3.9.0.bb b/recipes-security/optee/optee-os-stm32mp_3.9.0.bb
index ed3dbf5..8ee032e 100644
--- a/recipes-security/optee/optee-os-stm32mp_3.9.0.bb
+++ b/recipes-security/optee/optee-os-stm32mp_3.9.0.bb
@@ -36,16 +36,16 @@ include ${@oe.utils.ifelse(d.getVar('ST_ARCHIVER_ENABLE') == '1', 'optee-os-stm3
 # ---------------------------------
 # Configure devupstream class usage
 # ---------------------------------
-#BBCLASSEXTEND = "devupstream:target"
+BBCLASSEXTEND = "devupstream:target"
 
-#SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/optee_os.git;protocol=https;name=opteeos;branch=3.3.0-stm32mp"
-#SRCREV_class-devupstream = "5f5cc70dfd04419be2ba66b87f41584b6136118c"
-#SRCREV_FORMAT_class-devupstream = "opteeos"
-#PV_class-devupstream = "${OPTEE_VERSION}+github+${SRCPV}"
+SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/optee_os.git;protocol=https;name=opteeos;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
 # ---------------------------------
-#STM32MP_SOURCE_SELECTION ?= "tarball"
+STM32MP_SOURCE_SELECTION ?= "tarball"
 
-#DEFAULT_PREFERENCE = "${@bb.utils.contains('STM32MP_SOURCE_SELECTION', 'github', '-1', '1', d)}"
+DEFAULT_PREFERENCE = "${@bb.utils.contains('STM32MP_SOURCE_SELECTION', 'github', '-1', '1', d)}"