OPTEE-OS-STM32MP: 3.16.0-stm32mp-r2

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

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

@@ -20,9 +20,6 @@ DEPLOYDIR ?= \$(SRC_PATH)/../deploy
 
 # Set default optee-os config
 CFG_EMBED_DTB_SOURCE_FILE ?= ${OPTEE_CONF}
-OPTEE_DRAMSIZE ?=
-OPTEE_DRAMSIZE_EV ?= 0x40000000
-OPTEE_DRAMSIZE_DK ?= 0x20000000
 
 # Remove default variables
 LDFLAGS =
@@ -31,26 +28,6 @@ CPPFLAGS =
 # Define default make options
 EXTRA_OEMAKE = $(echo "${EXTRA_OEMAKE}" | sed "s|LIBGCC_LOCATE_CFLAGS=[^ ]* |LIBGCC_LOCATE_CFLAGS=\$(KCFLAGS) |")
 
-# Check that provided devicetree file follow the default naming rules:
-#   devicetree name should contains the original stm32mp devicetree name to allow proper auto-configuration
-check_dt:= \$(shell \\
-	for dt in \$(CFG_EMBED_DTB_SOURCE_FILE); do \\
-		match_naming="\$\$dt" ; \\
-		for stdt in ${STM32MP_DEVICETREE} ; do \\
-			if [ "\$\$(echo \$\$dt | grep -cE "\$\$stdt\$\$|\$\$stdt-")" -eq 1 ]; then \\
-				match_naming="" ; \\
-				break ; \\
-			fi ; \\
-		done ; \\
-		echo \$\$match_naming ; \\
-	done)
-
-ifneq (\$(check_dt),)
-ifeq (\$(OPTEE_DRAMSIZE),)
-\$(error Devicetree name "\$(check_dt)" is not compatible with optee-os-stm32mp auto configuration switch: you should configure OPTEE_DRAMSIZE by yourself)
-endif
-endif
-
 # Set dependencies list for building all
 DEPS = optee
 DEPS += fip
@@ -59,21 +36,6 @@ help:
 	@echo
 	@echo "OPTEE-OS configuration:"
 	@echo "  CFG_EMBED_DTB_SOURCE_FILE = \$(CFG_EMBED_DTB_SOURCE_FILE)"
-	@echo "  DRAM size setting:"
-	@for dt in \$(CFG_EMBED_DTB_SOURCE_FILE); do \\
-		if [ -n "\$(OPTEE_DRAMSIZE)" ]; then \
-			dramsize_config="OPTEE_DRAMSIZE = \$(OPTEE_DRAMSIZE)" ; \
-		else \
-			dramsize_config="OPTEE_DRAMSIZE_EV = \$(OPTEE_DRAMSIZE_EV)" ; \\
-			for dk in ${STM32MP_DT_FILES_DK} ; do \\
-				if [ "\$\$(echo \$\$dt | grep -cE "\$\$dk\$\$|\$\$dk-")" -eq 1 ]; then \\
-					dramsize_config="OPTEE_DRAMSIZE_DK = \$(OPTEE_DRAMSIZE_DK)" ; \\
-					break ; \\
-				fi ; \\
-			done ; \\
-		fi ; \\
-		echo "    \$\$dt : \$\$dramsize_config" ; \\
-	done
 	@echo
 	@echo "OPTEE-OS folder configuration:"
 	@echo "  SRC_PATH  = \$(SRC_PATH)"
@@ -105,19 +67,7 @@ optee:
 					break ; \\
 				fi ; \\
 			done ; \\
-			# Configure DRAM_SIZE switch \\
+			\$(MAKE) \$(EXTRA_OEMAKE) -C \$(SRC_PATH) PREFIX=\$(SDKTARGETSYSROOT) O=\$(BLD_PATH)/\$\$dt CFG_EMBED_DTB_SOURCE_FILE=\$\$dt.dts \$\$soc_extra ; \\
-			if [ -n "\$(OPTEE_DRAMSIZE)" ]; then \\
-				dramsize="\$(OPTEE_DRAMSIZE)" ; \\
-			else \\
-				dramsize="\$(OPTEE_DRAMSIZE_EV)" ; \\
-				for dk in ${STM32MP_DT_FILES_DK} ; do \\
-					if [ "\$\$(echo \$\$dt | grep -cE "\$\$dk\$\$|\$\$dk-")" -eq 1 ]; then \\
-						dramsize="\$(OPTEE_DRAMSIZE_DK)" ; \\
-						break ; \\
-					fi ; \\
-				done ; \\
-			fi ; \\
-			\$(MAKE) \$(EXTRA_OEMAKE) -C \$(SRC_PATH) PREFIX=\$(SDKTARGETSYSROOT) O=\$(BLD_PATH)/\$\$dt CFG_EMBED_DTB_SOURCE_FILE=\$\$dt.dts CFG_DRAM_SIZE=\$\$dramsize \$\$soc_extra ; \\
 			# Copy binary files with explicit name \\
 			cp \$(BLD_PATH)/\$\$dt/core/${OPTEE_HEADER}.${OPTEE_SUFFIX} \$(DEPLOYDIR)/${OPTEE_HEADER}-\$\$dt.${OPTEE_SUFFIX} ; \\
 			cp \$(BLD_PATH)/\$\$dt/core/${OPTEE_PAGER}.${OPTEE_SUFFIX} \$(DEPLOYDIR)/${OPTEE_PAGER}-\$\$dt.${OPTEE_SUFFIX} ; \\

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

@@ -49,9 +49,12 @@ do_compile() {
     export OPENSSL_MODULES=${STAGING_LIBDIR_NATIVE}/ossl-modules/
     if [ -n "${OPTEE_CONF}" ]; then
         for conf in ${OPTEE_CONF}; do
+            # Configure SOC switch
+            soc_extra=""
             for soc in ${STM32MP_SOC_NAME}; do
                 if [ "$(echo ${conf} | grep -c ${soc})" -eq 1 ]; then
                     soc_extra="$(echo CFG_${soc} | awk '{print toupper($0)}')=y"
+                    break
                 fi
             done
 

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

@@ -8,13 +8,14 @@ SRCREV = "d0b742d1564834dac903f906168d7357063d5459"
 SRC_URI += " \
     file://fonts.tar.gz;subdir=git;name=fonts  \
     file://0001-3.16.0-stm32mp-r1.patch        \
+    file://0002-3.16.0-stm32mp-r2.patch    \
     "
 
 SRC_URI[fonts.sha256sum] = "4941e8bb6d8ac377838e27b214bf43008c496a24a8f897e0b06433988cbd53b2"
 
 OPTEE_VERSION = "3.16.0"
 OPTEE_SUBVERSION = "stm32mp"
-OPTEE_RELEASE = "r1"
+OPTEE_RELEASE = "r2"
 
 PV = "${OPTEE_VERSION}-${OPTEE_SUBVERSION}-${OPTEE_RELEASE}"
 
@@ -49,7 +50,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=${ARCHIVER_ST_BRANCH}"
-SRCREV:class-devupstream = "4bbca1689f6854f660a80327a0d2959537bea222"
+SRCREV:class-devupstream = "0f631da995da50fe7e19e0b7291032d77f7048bc"
 
 # ---------------------------------
 # Configure default preference to manage dynamic selection between tarball and github