[2/9] optee-os: Switch default binary to tee-raw.bin

Message ID 97e39370c5511bad150505b4e116f03b20882073.1704632056.git.jan.kiszka@siemens.com
State Superseded, archived
Headers show
Series Add support for BeaglePlay | expand

Commit Message

Jan Kiszka Jan. 7, 2024, 12:54 p.m. UTC
From: Jan Kiszka <jan.kiszka@siemens.com>

This is standard now with 3.21. In-tree users are not affected, leave
note in changelog for out-of-tree users.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 RECIPE-API-CHANGELOG.md                | 5 +++++
 meta/recipes-bsp/optee-os/optee-os.inc | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

Patch

diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
index bea12871..d4000933 100644
--- a/RECIPE-API-CHANGELOG.md
+++ b/RECIPE-API-CHANGELOG.md
@@ -566,3 +566,8 @@  supported, but a warning is issued when it is used. Future versions will drop
 When building a custom kernel module, the `KBuild` file might be located in
 a subdirectory. To support this use-case, set `MODULE_DIR=$(PWD)/subdir` in
 the module build recipe.
+
+### Change OPTEE_BINARIES default ###
+
+Since OP-TEE 3.21, tee-raw.bin is produced for all platforms and is considered
+the better default option. `OPTEE_BINARIES` now uses this as default as well.
diff --git a/meta/recipes-bsp/optee-os/optee-os.inc b/meta/recipes-bsp/optee-os/optee-os.inc
index 240bb114..d2c5cd93 100644
--- a/meta/recipes-bsp/optee-os/optee-os.inc
+++ b/meta/recipes-bsp/optee-os/optee-os.inc
@@ -16,7 +16,7 @@  DESCRIPTION ?= "Custom OP-TEE OS"
 OPTEE_NAME ?= "${MACHINE}"
 OPTEE_PLATFORM ?= "unknown"
 OPTEE_EXTRA_BUILDARGS ?= ""
-OPTEE_BINARIES ?= "tee-pager_v2.bin"
+OPTEE_BINARIES ?= "tee-raw.bin"
 
 DEBIAN_PACKAGE_NAME ?= "optee-os-${OPTEE_NAME}"