From ca0bb702e7df1be659ee7db94da989ac84bd3136 Mon Sep 17 00:00:00 2001
From: Philippe Coval <philippe.coval.ext@huawei.com>
Date: Wed, 3 Aug 2022 16:40:33 +0200
Subject: [PATCH] recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.0.inc:
Update ref of zephyrproject-rtos/trusted-firmware-m
It looks like legacy branch has been cleaned from upstream, only master remains
https://github.com/zephyrproject-rtos/trusted-firmware-m/branches
I used the revision on earlier version assuming it's closer to what we used before.
Also for the record USB debuging is working which is not the case in kirkstone version, I'll diff to narrow the problem.
Relate-to: https://gitlab.eclipse.org/eclipse/oniro-core/meta-zephyr-bsp/-/issues/1
Signed-off-by: Philippe Coval <philippe.coval.ext@huawei.com>
---
recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.0.inc | 2 +-
recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.0.inc b/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.0.inc
index 5a22b3c..eb94666 100644
--- a/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.0.inc
+++ b/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.0.inc
@@ -40,7 +40,7 @@ SRCREV_nrf_hw_models = "a47e326ca772ddd14cc3b9d4ca30a9ab44ecca16"
SRCREV_TraceRecorderSource = "5b5f8d7adbf0e93a09087e8f5708f0eebb8b25bf"
SRCREV_hal_xtensa = "2f04b615cd5ad3a1b8abef33f9bdd10cc1990ed6"
SRCREV_edtt = "7dd56fc100d79cc45c33d43e7401d1803e26f6e7"
-SRCREV_trusted-firmware-m = "e18b7a9b040b5b5324520388047c9e7d678447e6"
+SRCREV_trusted-firmware-m = "7387d88158701a3c51ad51c90a05326ee12847a8"
SRCREV_nanopb = "d148bd26718e4c10414f07a7eb1bd24c62e56c5d"
SRCREV_tensorflow = "dc70a45a7cc12c25726a32cd91b28be59e7bc596"
diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc b/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc
index ebcbb55..6ed3670 100644
--- a/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc
+++ b/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc
@@ -50,7 +50,7 @@ SRC_URI = "\
git://github.com/zephyrproject-rtos/TraceRecorderSource.git;branch=zephyr;protocol=https;destsuffix=git/modules/debug/TraceRecorder;name=TraceRecorderSource \
git://github.com/zephyrproject-rtos/hal_xtensa.git;branch=master;protocol=https;destsuffix=git/modules/hal/xtensa;name=hal_xtensa \
git://github.com/zephyrproject-rtos/edtt.git;protocol=https;branch=public_master;destsuffix=git/tools/edtt;name=edtt \
- git://github.com/zephyrproject-rtos/trusted-firmware-m.git;protocol=https;branch=legacy;destsuffix=git/modules/tee/tfm;name=trusted-firmware-m \
+ git://github.com/zephyrproject-rtos/trusted-firmware-m.git;protocol=https;branch=master;destsuffix=git/modules/tee/tfm;name=trusted-firmware-m \
git://github.com/zephyrproject-rtos/nanopb.git;branch=zephyr;protocol=https;destsuffix=git/modules/lib/nanopb;name=nanopb \
git://github.com/zephyrproject-rtos/tensorflow.git;branch=zephyr;protocol=https;destsuffix=git/modules/lib/tensorflow;name=tensorflow \
file://arduino-usb-cdc-acm-enble.patch \
--
GitLab