From 1080128578460a0735d73c874f5b08285173b093 Mon Sep 17 00:00:00 2001
From: lucicop <lucicop2001@yahoo.com>
Date: Tue, 28 Sep 2021 17:17:44 +0300
Subject: [PATCH] Modify GN to build FreeRTOS from third party source repo
 (#9986)

* Modify GN to build FreeRTOS from third party source repo

* Remove lowercase "portable" folder
---
 third_party/qpg_sdk/BUILD.gn | 23 ++++++++++++++++++++++-
 third_party/qpg_sdk/repo     |  2 +-
 2 files changed, 23 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 third_party/qpg_sdk/BUILD.gn

diff --git a/third_party/qpg_sdk/BUILD.gn b/third_party/qpg_sdk/BUILD.gn
old mode 100644
new mode 100755
index 99864856d8b630..1f3729346b3e54
--- a/third_party/qpg_sdk/BUILD.gn
+++ b/third_party/qpg_sdk/BUILD.gn
@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import("//build_overrides/freertos.gni")
 import("//build_overrides/qpg_sdk.gni")
+import("${freertos_root}/freertos.gni")
 import("${qpg_sdk_build_root}/qpg_sdk.gni")
 
 declare_args() {
@@ -23,5 +25,24 @@ declare_args() {
 assert(qpg_sdk_target != "", "qpg_sdk_target must be specified")
 
 group("qpg_sdk") {
-  public_deps = [ qpg_sdk_target ]
+  public_deps = [
+    ":freertos",
+    qpg_sdk_target,
+  ]
+}
+
+config("qpg_freertos_config") {
+  include_dirs = [
+    "${chip_root}/third_party/qpg_sdk/repo/qpg6100/comps/gpFreeRTOS/config",
+    "${freertos_root}/repo/portable/GCC/ARM_CM3",
+  ]
+}
+
+freertos_target("freertos") {
+  sources = [
+    "${freertos_root}/repo/portable/GCC/ARM_CM3/port.c",
+    "${freertos_root}/repo/portable/MemMang/heap_3.c",
+  ]
+
+  public_configs = [ ":qpg_freertos_config" ]
 }
diff --git a/third_party/qpg_sdk/repo b/third_party/qpg_sdk/repo
index 9ae1935b25a16f..b9ba5a9f744ffc 160000
--- a/third_party/qpg_sdk/repo
+++ b/third_party/qpg_sdk/repo
@@ -1 +1 @@
-Subproject commit 9ae1935b25a16fc68873696c3c6eac671a1aaa95
+Subproject commit b9ba5a9f744ffc8e73dce60808e1e2dc161c30d2