ARCHIVER: Update for fip build and release information

Change-Id: I8ddd8c61ff7488ce40f87a160f603de32425386a

recipes-security/optee/optee-os-stm32mp-archiver.inc

@@ -30,10 +30,22 @@ CFLAGS =
 CPPFLAGS =
 # Define default make options
 EXTRA_OEMAKE = $(echo "${EXTRA_OEMAKE}" | sed "s|LIBGCC_LOCATE_CFLAGS=[^ ]* |LIBGCC_LOCATE_CFLAGS=\$(KCFLAGS) |;s|comp-cflagscore='[^']*'|comp-cflagscore='\$(KCFLAGS)'|")
-EXTRA_OEMAKE += \$(if \$(ENABLE_FIP),,CFG_STM32MP15x_STM32IMAGE=y)
+ifeq (\$(ENABLE_FIP), 0)
+EXTRA_OEMAKE += CFG_STM32MP15x_STM32IMAGE=y
+endif
 
 # Configure default optee-os features
-OPTEE_SUFFIX ?= \$(if \$(ENABLE_FIP),bin,stm32)
+ifeq (\$(ENABLE_FIP), 1)
+OPTEE_SUFFIX ?= bin
+else
+OPTEE_SUFFIX ?= stm32
+endif
+
+# Set dependencies list for building all
+DEPS = optee
+ifeq (\$(ENABLE_FIP), 1)
+DEPS += fip
+endif
 
 help:
 	@echo
@@ -56,7 +68,7 @@ endif
 	@echo "  clean : clean build directories from generated files"
 	@echo
 
-all: optee \$(if \$(ENABLE_FIP),fip)
+all: \$(DEPS)
 
 optee:
 	@mkdir -p \$(DEPLOYDIR)

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

@@ -10,7 +10,15 @@ SRC_URI += " \
     "
 
 OPTEE_VERSION = "3.12.0"
-PV = "${OPTEE_VERSION}.r1"
+OPTEE_SUBVERSION = "stm32mp"
+OPTEE_RELEASE = "r1"
+
+PV = "${OPTEE_VERSION}-${OPTEE_SUBVERSION}-${OPTEE_RELEASE}"
+
+ARCHIVER_ST_BRANCH = "${OPTEE_VERSION}-${OPTEE_SUBVERSION}"
+ARCHIVER_ST_REVISION = "${PV}"
+ARCHIVER_COMMUNITY_BRANCH = "master"
+ARCHIVER_COMMUNITY_REVISION = "${OPTEE_VERSION}"
 
 S = "${WORKDIR}/git"
 
@@ -38,7 +46,7 @@ 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;branch=${OPTEE_VERSION}-stm32mp"
+SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/optee_os.git;protocol=https;branch=${ARCHIVER_ST_BRANCH}"
 SRCREV_class-devupstream = "0bd33404e9581d00514034b7b05a2cbe8649c1fd"
 
 # ---------------------------------

recipes-security/optee/optee-os/README.HOW_TO.txt

@@ -41,10 +41,20 @@ on the code see section 4 [Management of optee-os source code]
 
 4. Management of optee-os source code:
 -----------------------------------
-If you like to have a better management of change made on optee-os source, you
-can use git:
+If you like to have a better management of change made on optee-os source,
+you have 3 solutions to use git
+
+4.1 Get STMicroelectronics optee-os source from GitHub
+    URL: https://github.com/STMicroelectronics/optee_os.git
+    Branch: ##ARCHIVER_ST_BRANCH##
+    Revision: ##ARCHIVER_ST_REVISION##
+
+    $ git clone https://github.com/STMicroelectronics/optee_os.git
+    $ git checkout -b WORKING ##ARCHIVER_ST_REVISION##
+
+4.2 Create Git from tarball
     $ cd <optee-os source>
-    $ test -d .git || git init . && git add . && git commit -m "optee-ossource code" && git gc
+    $ test -d .git || git init . && git add . && git commit -m "optee-os source code" && git gc
     $ git checkout -b WORKING
     $ for p in `ls -1 <path to patch>/*.patch`; do git am $p; done
 
@@ -52,14 +62,14 @@ MANDATORY: You must update sources
     $ cd <directory to optee-os source code>
     $ chmod 755 scripts/bin_to_c.py
 
-NB: you can use directly the source from the community:
+4.3 Get Git from community and apply STMicroelectronics patches
     URL: git://github.com/OP-TEE/optee_os.git
-    Branch: ##GIT_BRANCH##
-    Revision: ##GIT_SRCREV##
+    Branch: ##ARCHIVER_COMMUNITY_BRANCH##
+    Revision: ##ARCHIVER_COMMUNITY_REVISION##
 
     $ git clone git://github.com/OP-TEE/optee_os.git
     $ cd <optee-os source>
-    $ git checkout -b WORKING ##GIT_SRCREV##
+    $ git checkout -b WORKING ##ARCHIVER_COMMUNITY_REVISION##
     $ for p in `ls -1 <path to patch>/*.patch`; do git am $p; done
 
 MANDATORY: You must update sources