From 017b0434735534d3ef1b1407289046b3b773717a Mon Sep 17 00:00:00 2001
From: Lingkai Dong <lingkai.dong@arm.com>
Date: Thu, 13 Aug 2020 11:18:31 +0100
Subject: [PATCH] TARGET_PSOC6: set CY_RTOS_AWARE based on RTOS availability

---
 rtos/source/TARGET_CORTEX/mbed_lib.json | 3 +++
 targets/targets.json                    | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/rtos/source/TARGET_CORTEX/mbed_lib.json b/rtos/source/TARGET_CORTEX/mbed_lib.json
index 8fe9e42620..6ef6c49d6f 100644
--- a/rtos/source/TARGET_CORTEX/mbed_lib.json
+++ b/rtos/source/TARGET_CORTEX/mbed_lib.json
@@ -81,6 +81,9 @@
         },
         "NUVOTON": {
             "idle-thread-stack-size-debug-extra": 512
+        },
+        "MCU_PSOC6_M4": {
+            "target.macros_add": ["CY_RTOS_AWARE"]
         }
     }
 }
diff --git a/targets/targets.json b/targets/targets.json
index c97cb630a1..0070733152 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -5893,7 +5893,6 @@
         ],
         "macros_add": [
             "MCU_PSOC6_M4",
-            "CY_RTOS_AWARE",
             "CY_USING_HAL",
             "MBED_TICKLESS"
         ],