From 72163f3d2e29f661231d802796be1e3f7d75b86a Mon Sep 17 00:00:00 2001
From: Wilfried Chauveau <wilfried.chauveau@ithinuel.me>
Date: Tue, 30 Apr 2024 19:56:43 +0100
Subject: [PATCH 1/2] =?UTF-8?q?rtos:=20Add=20hint=20for=20zephyr=E2=80=99s?=
 =?UTF-8?q?=20Thread=20Info=20configuration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This should allow for easier discoverability of that parameter.
---
 pyocd/rtos/provider.py | 7 ++++---
 pyocd/rtos/zephyr.py   | 6 +++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pyocd/rtos/provider.py b/pyocd/rtos/provider.py
index a3d922804..73b09ac24 100644
--- a/pyocd/rtos/provider.py
+++ b/pyocd/rtos/provider.py
@@ -53,14 +53,15 @@ def __init__(self, target):
         self._last_run_token = -1
         self._read_from_target = False
 
-    def _lookup_symbols(self, symbolList, symbolProvider):
+    def _lookup_symbols(self, symbolList, symbolProvider, allowPartial = False):
         syms = {}
         for name in symbolList:
             addr = symbolProvider.get_symbol_value(name)
             LOG.debug("Value for symbol %s = %s", name, hex(addr) if addr is not None else "<none>")
-            if addr is None:
+            if addr is not None:
+                syms[name] = addr
+            elif not allowPartial:
                 return None
-            syms[name] = addr
         return syms
 
     def init(self, symbolProvider):
diff --git a/pyocd/rtos/zephyr.py b/pyocd/rtos/zephyr.py
index 5f67221c9..cbde29788 100644
--- a/pyocd/rtos/zephyr.py
+++ b/pyocd/rtos/zephyr.py
@@ -274,9 +274,13 @@ def __init__(self, target):
 
     def init(self, symbolProvider):
         # Lookup required symbols.
-        self._symbols = self._lookup_symbols(self.ZEPHYR_SYMBOLS, symbolProvider)
+        self._symbols = self._lookup_symbols(self.ZEPHYR_SYMBOLS, symbolProvider, True)
         if self._symbols is None:
             return False
+        if len(self._symbols) != len(self.ZEPHYR_SYMBOLS):
+            LOG.warning("Zephyr kernel detected. Build your Zephyr application with `CONFIG_DEBUG_THREAD_INFO=y` to " +
+                        "enable thread awareness.")
+            return False
 
         self._update()
         self._target.session.subscribe(self.event_handler, Target.Event.POST_FLASH_PROGRAM)

From 287fd43cfe892c991dc83d41e1a7a9c6848c2e96 Mon Sep 17 00:00:00 2001
From: Wilfried Chauveau <wilfried.chauveau@ithinuel.me>
Date: Tue, 30 Apr 2024 23:15:52 +0100
Subject: [PATCH 2/2] ci: dropping python 3.7 on macos from CI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It is no longer present in python’s GHA
---
 .github/workflows/basic_test.yaml         | 3 +++
 .github/workflows/basic_test_skipped.yaml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/basic_test.yaml b/.github/workflows/basic_test.yaml
index 5419e9f91..b1f1f0b46 100644
--- a/.github/workflows/basic_test.yaml
+++ b/.github/workflows/basic_test.yaml
@@ -32,6 +32,9 @@ jobs:
         - "3.9"
         - "3.10"
         - "3.11"
+        exclude:
+          - os: macos-latest
+            python-version: "3.7"
 
     steps:
     # Only check out HEAD. We don't need the full history.
diff --git a/.github/workflows/basic_test_skipped.yaml b/.github/workflows/basic_test_skipped.yaml
index b5ebc8117..b1d12d703 100644
--- a/.github/workflows/basic_test_skipped.yaml
+++ b/.github/workflows/basic_test_skipped.yaml
@@ -29,5 +29,8 @@ jobs:
         - "3.9"
         - "3.10"
         - "3.11"
+        exclude:
+          - os: macos-latest
+            python-version: "3.7"
     steps:
       - run: 'echo "Skipped due to path filter."'