From 398b16f1df791352b59df97e86d77fcf1a1850b6 Mon Sep 17 00:00:00 2001
From: Rasmus <rasmus@zyax.se>
Date: Thu, 11 Jul 2024 10:10:50 +0200
Subject: [PATCH 1/7] Added gn option for external sdk target
---
src/system/BUILD.gn | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/system/BUILD.gn b/src/system/BUILD.gn
index 40ae99ae99c77e..5d0e336f22a6dc 100644
--- a/src/system/BUILD.gn
+++ b/src/system/BUILD.gn
@@ -43,6 +43,8 @@ declare_args() {
#
# see https://clang.llvm.org/docs/ThreadSafetyAnalysis.html
chip_enable_thread_safety_checks = is_clang
+
+ chip_external_sdk_target = ""
}
if (chip_project_config_include_dirs == [] &&
@@ -197,6 +199,9 @@ source_set("system_config_header") {
if (chip_device_platform == "bl702l") {
public_deps += [ "${bouffalolab_iot_sdk_build_root}/bl702l:bl_iot_sdk" ]
}
+ if (chip_external_sdk_target != "") {
+ public_deps += [ "${chip_external_sdk_target}" ]
+ }
# Add platform here as needed.
}
From 8ece47bfaa2d5f3010ba1d637ce7544f4dd66a93 Mon Sep 17 00:00:00 2001
From: Rasmus <rasmus@zyax.se>
Date: Fri, 26 Jul 2024 08:28:56 +0200
Subject: [PATCH 2/7] Updated SDK target picking
---
src/system/BUILD.gn | 77 ++++++++++++++++++++++++---------------------
1 file changed, 41 insertions(+), 36 deletions(-)
diff --git a/src/system/BUILD.gn b/src/system/BUILD.gn
index 5d0e336f22a6dc..847884ef2cad75 100644
--- a/src/system/BUILD.gn
+++ b/src/system/BUILD.gn
@@ -44,7 +44,9 @@ declare_args() {
# see https://clang.llvm.org/docs/ThreadSafetyAnalysis.html
chip_enable_thread_safety_checks = is_clang
- chip_external_sdk_target = ""
+ # SDK target for the platform
+ # If left blank the SDK target will be determined by the device platform
+ chip_platform_sdk_target = ""
}
if (chip_project_config_include_dirs == [] &&
@@ -53,6 +55,42 @@ if (chip_project_config_include_dirs == [] &&
chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
}
+if(chip_platform_sdk_target == "")
+{
+ if (target_cpu != "esp32") {
+ if (chip_system_config_use_lwip) {
+ chip_platform_sdk_target = "${lwip_root}:lwip"
+ } else {
+ if (chip_device_platform == "efr32") {
+ chip_platform_sdk_target = "${efr32_sdk_build_root}:efr32_sdk"
+ }
+ if (chip_device_platform == "qpg") {
+ chip_platform_sdk_target = "${qpg_sdk_build_root}:qpg_sdk"
+ }
+ if (chip_device_platform == "nxp") {
+ chip_platform_sdk_target = "${nxp_sdk_build_root}:nxp_sdk"
+ }
+ if (chip_device_platform == "cyw30739") {
+ chip_platform_sdk_target = "${cyw30739_sdk_build_root}:cyw30739_sdk"
+ }
+ if (chip_device_platform == "stm32") {
+ chip_platform_sdk_target = "${stm32_sdk_build_root}:stm32_sdk"
+ }
+ if (chip_device_platform == "bl702") {
+ chip_platform_sdk_target = "${bouffalolab_iot_sdk_build_root}/bl702:bl_iot_sdk"
+ }
+ if (chip_device_platform == "bl702l") {
+ chip_platform_sdk_target = "${bouffalolab_iot_sdk_build_root}/bl702l:bl_iot_sdk"
+ }
+ if (chip_device_platform == "mt793x") {
+ chip_platform_sdk_target = "${mt793x_sdk_build_root}:mt793x_sdk"
+ }
+
+ # Add platform here as needed.
+ }
+ }
+}
+
if (chip_device_platform == "cc13x4_26x4") {
import("//build_overrides/ti_simplelink_sdk.gni")
} else if (chip_device_platform == "efr32") {
@@ -174,41 +212,8 @@ source_set("system_config_header") {
public_deps = []
- if (target_cpu != "esp32") {
- if (chip_system_config_use_lwip) {
- public_deps += [ "${lwip_root}:lwip" ]
- } else {
- if (chip_device_platform == "efr32") {
- public_deps += [ "${efr32_sdk_build_root}:efr32_sdk" ]
- }
- if (chip_device_platform == "qpg") {
- public_deps += [ "${qpg_sdk_build_root}:qpg_sdk" ]
- }
- if (chip_device_platform == "nxp") {
- public_deps += [ "${nxp_sdk_build_root}:nxp_sdk" ]
- }
- if (chip_device_platform == "cyw30739") {
- public_deps += [ "${cyw30739_sdk_build_root}:cyw30739_sdk" ]
- }
- if (chip_device_platform == "stm32") {
- public_deps += [ "${stm32_sdk_build_root}:stm32_sdk" ]
- }
- if (chip_device_platform == "bl702") {
- public_deps += [ "${bouffalolab_iot_sdk_build_root}/bl702:bl_iot_sdk" ]
- }
- if (chip_device_platform == "bl702l") {
- public_deps += [ "${bouffalolab_iot_sdk_build_root}/bl702l:bl_iot_sdk" ]
- }
- if (chip_external_sdk_target != "") {
- public_deps += [ "${chip_external_sdk_target}" ]
- }
-
- # Add platform here as needed.
- }
- }
-
- if (chip_device_platform == "mt793x") {
- public_deps += [ "${mt793x_sdk_build_root}:mt793x_sdk" ]
+ if(chip_platform_sdk_target != "") {
+ public_deps += [ chip_platform_sdk_target ]
}
}
From 6074693dbab5c70581c275cd4003008574df772f Mon Sep 17 00:00:00 2001
From: Rasmus <rasmus@zyax.se>
Date: Thu, 11 Jul 2024 10:10:50 +0200
Subject: [PATCH 3/7] Added gn option for external sdk target
---
src/system/BUILD.gn | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/system/BUILD.gn b/src/system/BUILD.gn
index 847884ef2cad75..a6ae3d328234d6 100644
--- a/src/system/BUILD.gn
+++ b/src/system/BUILD.gn
@@ -214,6 +214,9 @@ source_set("system_config_header") {
if(chip_platform_sdk_target != "") {
public_deps += [ chip_platform_sdk_target ]
+
+ if (chip_device_platform == "mt793x") {
+ public_deps += [ "${mt793x_sdk_build_root}:mt793x_sdk" ]
}
}
From e788734efc4b77ec470912d78e0912ec8688eb0e Mon Sep 17 00:00:00 2001
From: Rasmus <rasmus@zyax.se>
Date: Fri, 26 Jul 2024 08:28:56 +0200
Subject: [PATCH 4/7] Updated SDK target picking
---
src/system/BUILD.gn | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/system/BUILD.gn b/src/system/BUILD.gn
index a6ae3d328234d6..847884ef2cad75 100644
--- a/src/system/BUILD.gn
+++ b/src/system/BUILD.gn
@@ -214,9 +214,6 @@ source_set("system_config_header") {
if(chip_platform_sdk_target != "") {
public_deps += [ chip_platform_sdk_target ]
-
- if (chip_device_platform == "mt793x") {
- public_deps += [ "${mt793x_sdk_build_root}:mt793x_sdk" ]
}
}
From 9bc2ed33527c30297b3602faf329d6f297dda44a Mon Sep 17 00:00:00 2001
From: Rasmus <rasmus@zyax.se>
Date: Fri, 26 Jul 2024 08:41:49 +0200
Subject: [PATCH 5/7] Updated SDK var
---
src/system/BUILD.gn | 77 +++++++++++++++++++++------------------------
1 file changed, 36 insertions(+), 41 deletions(-)
diff --git a/src/system/BUILD.gn b/src/system/BUILD.gn
index 847884ef2cad75..5d0e336f22a6dc 100644
--- a/src/system/BUILD.gn
+++ b/src/system/BUILD.gn
@@ -44,9 +44,7 @@ declare_args() {
# see https://clang.llvm.org/docs/ThreadSafetyAnalysis.html
chip_enable_thread_safety_checks = is_clang
- # SDK target for the platform
- # If left blank the SDK target will be determined by the device platform
- chip_platform_sdk_target = ""
+ chip_external_sdk_target = ""
}
if (chip_project_config_include_dirs == [] &&
@@ -55,42 +53,6 @@ if (chip_project_config_include_dirs == [] &&
chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
}
-if(chip_platform_sdk_target == "")
-{
- if (target_cpu != "esp32") {
- if (chip_system_config_use_lwip) {
- chip_platform_sdk_target = "${lwip_root}:lwip"
- } else {
- if (chip_device_platform == "efr32") {
- chip_platform_sdk_target = "${efr32_sdk_build_root}:efr32_sdk"
- }
- if (chip_device_platform == "qpg") {
- chip_platform_sdk_target = "${qpg_sdk_build_root}:qpg_sdk"
- }
- if (chip_device_platform == "nxp") {
- chip_platform_sdk_target = "${nxp_sdk_build_root}:nxp_sdk"
- }
- if (chip_device_platform == "cyw30739") {
- chip_platform_sdk_target = "${cyw30739_sdk_build_root}:cyw30739_sdk"
- }
- if (chip_device_platform == "stm32") {
- chip_platform_sdk_target = "${stm32_sdk_build_root}:stm32_sdk"
- }
- if (chip_device_platform == "bl702") {
- chip_platform_sdk_target = "${bouffalolab_iot_sdk_build_root}/bl702:bl_iot_sdk"
- }
- if (chip_device_platform == "bl702l") {
- chip_platform_sdk_target = "${bouffalolab_iot_sdk_build_root}/bl702l:bl_iot_sdk"
- }
- if (chip_device_platform == "mt793x") {
- chip_platform_sdk_target = "${mt793x_sdk_build_root}:mt793x_sdk"
- }
-
- # Add platform here as needed.
- }
- }
-}
-
if (chip_device_platform == "cc13x4_26x4") {
import("//build_overrides/ti_simplelink_sdk.gni")
} else if (chip_device_platform == "efr32") {
@@ -212,8 +174,41 @@ source_set("system_config_header") {
public_deps = []
- if(chip_platform_sdk_target != "") {
- public_deps += [ chip_platform_sdk_target ]
+ if (target_cpu != "esp32") {
+ if (chip_system_config_use_lwip) {
+ public_deps += [ "${lwip_root}:lwip" ]
+ } else {
+ if (chip_device_platform == "efr32") {
+ public_deps += [ "${efr32_sdk_build_root}:efr32_sdk" ]
+ }
+ if (chip_device_platform == "qpg") {
+ public_deps += [ "${qpg_sdk_build_root}:qpg_sdk" ]
+ }
+ if (chip_device_platform == "nxp") {
+ public_deps += [ "${nxp_sdk_build_root}:nxp_sdk" ]
+ }
+ if (chip_device_platform == "cyw30739") {
+ public_deps += [ "${cyw30739_sdk_build_root}:cyw30739_sdk" ]
+ }
+ if (chip_device_platform == "stm32") {
+ public_deps += [ "${stm32_sdk_build_root}:stm32_sdk" ]
+ }
+ if (chip_device_platform == "bl702") {
+ public_deps += [ "${bouffalolab_iot_sdk_build_root}/bl702:bl_iot_sdk" ]
+ }
+ if (chip_device_platform == "bl702l") {
+ public_deps += [ "${bouffalolab_iot_sdk_build_root}/bl702l:bl_iot_sdk" ]
+ }
+ if (chip_external_sdk_target != "") {
+ public_deps += [ "${chip_external_sdk_target}" ]
+ }
+
+ # Add platform here as needed.
+ }
+ }
+
+ if (chip_device_platform == "mt793x") {
+ public_deps += [ "${mt793x_sdk_build_root}:mt793x_sdk" ]
}
}
From 62055a14a6633068a9b5c016ff25409987b6185a Mon Sep 17 00:00:00 2001
From: Rasmus <rasmus@zyax.se>
Date: Fri, 26 Jul 2024 08:28:56 +0200
Subject: [PATCH 6/7] Updated SDK target picking
---
src/system/BUILD.gn | 77 ++++++++++++++++++++++++---------------------
1 file changed, 41 insertions(+), 36 deletions(-)
diff --git a/src/system/BUILD.gn b/src/system/BUILD.gn
index 5d0e336f22a6dc..847884ef2cad75 100644
--- a/src/system/BUILD.gn
+++ b/src/system/BUILD.gn
@@ -44,7 +44,9 @@ declare_args() {
# see https://clang.llvm.org/docs/ThreadSafetyAnalysis.html
chip_enable_thread_safety_checks = is_clang
- chip_external_sdk_target = ""
+ # SDK target for the platform
+ # If left blank the SDK target will be determined by the device platform
+ chip_platform_sdk_target = ""
}
if (chip_project_config_include_dirs == [] &&
@@ -53,6 +55,42 @@ if (chip_project_config_include_dirs == [] &&
chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
}
+if(chip_platform_sdk_target == "")
+{
+ if (target_cpu != "esp32") {
+ if (chip_system_config_use_lwip) {
+ chip_platform_sdk_target = "${lwip_root}:lwip"
+ } else {
+ if (chip_device_platform == "efr32") {
+ chip_platform_sdk_target = "${efr32_sdk_build_root}:efr32_sdk"
+ }
+ if (chip_device_platform == "qpg") {
+ chip_platform_sdk_target = "${qpg_sdk_build_root}:qpg_sdk"
+ }
+ if (chip_device_platform == "nxp") {
+ chip_platform_sdk_target = "${nxp_sdk_build_root}:nxp_sdk"
+ }
+ if (chip_device_platform == "cyw30739") {
+ chip_platform_sdk_target = "${cyw30739_sdk_build_root}:cyw30739_sdk"
+ }
+ if (chip_device_platform == "stm32") {
+ chip_platform_sdk_target = "${stm32_sdk_build_root}:stm32_sdk"
+ }
+ if (chip_device_platform == "bl702") {
+ chip_platform_sdk_target = "${bouffalolab_iot_sdk_build_root}/bl702:bl_iot_sdk"
+ }
+ if (chip_device_platform == "bl702l") {
+ chip_platform_sdk_target = "${bouffalolab_iot_sdk_build_root}/bl702l:bl_iot_sdk"
+ }
+ if (chip_device_platform == "mt793x") {
+ chip_platform_sdk_target = "${mt793x_sdk_build_root}:mt793x_sdk"
+ }
+
+ # Add platform here as needed.
+ }
+ }
+}
+
if (chip_device_platform == "cc13x4_26x4") {
import("//build_overrides/ti_simplelink_sdk.gni")
} else if (chip_device_platform == "efr32") {
@@ -174,41 +212,8 @@ source_set("system_config_header") {
public_deps = []
- if (target_cpu != "esp32") {
- if (chip_system_config_use_lwip) {
- public_deps += [ "${lwip_root}:lwip" ]
- } else {
- if (chip_device_platform == "efr32") {
- public_deps += [ "${efr32_sdk_build_root}:efr32_sdk" ]
- }
- if (chip_device_platform == "qpg") {
- public_deps += [ "${qpg_sdk_build_root}:qpg_sdk" ]
- }
- if (chip_device_platform == "nxp") {
- public_deps += [ "${nxp_sdk_build_root}:nxp_sdk" ]
- }
- if (chip_device_platform == "cyw30739") {
- public_deps += [ "${cyw30739_sdk_build_root}:cyw30739_sdk" ]
- }
- if (chip_device_platform == "stm32") {
- public_deps += [ "${stm32_sdk_build_root}:stm32_sdk" ]
- }
- if (chip_device_platform == "bl702") {
- public_deps += [ "${bouffalolab_iot_sdk_build_root}/bl702:bl_iot_sdk" ]
- }
- if (chip_device_platform == "bl702l") {
- public_deps += [ "${bouffalolab_iot_sdk_build_root}/bl702l:bl_iot_sdk" ]
- }
- if (chip_external_sdk_target != "") {
- public_deps += [ "${chip_external_sdk_target}" ]
- }
-
- # Add platform here as needed.
- }
- }
-
- if (chip_device_platform == "mt793x") {
- public_deps += [ "${mt793x_sdk_build_root}:mt793x_sdk" ]
+ if(chip_platform_sdk_target != "") {
+ public_deps += [ chip_platform_sdk_target ]
}
}
From 76323e470704563bb15026052b3dab68550950cc Mon Sep 17 00:00:00 2001
From: Rasmus <rasmus@zyax.se>
Date: Fri, 26 Jul 2024 08:41:49 +0200
Subject: [PATCH 7/7] Updated SDK var
---
src/system/BUILD.gn | 77 +++++++++++++++++++++------------------------
1 file changed, 36 insertions(+), 41 deletions(-)
diff --git a/src/system/BUILD.gn b/src/system/BUILD.gn
index 847884ef2cad75..5d0e336f22a6dc 100644
--- a/src/system/BUILD.gn
+++ b/src/system/BUILD.gn
@@ -44,9 +44,7 @@ declare_args() {
# see https://clang.llvm.org/docs/ThreadSafetyAnalysis.html
chip_enable_thread_safety_checks = is_clang
- # SDK target for the platform
- # If left blank the SDK target will be determined by the device platform
- chip_platform_sdk_target = ""
+ chip_external_sdk_target = ""
}
if (chip_project_config_include_dirs == [] &&
@@ -55,42 +53,6 @@ if (chip_project_config_include_dirs == [] &&
chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
}
-if(chip_platform_sdk_target == "")
-{
- if (target_cpu != "esp32") {
- if (chip_system_config_use_lwip) {
- chip_platform_sdk_target = "${lwip_root}:lwip"
- } else {
- if (chip_device_platform == "efr32") {
- chip_platform_sdk_target = "${efr32_sdk_build_root}:efr32_sdk"
- }
- if (chip_device_platform == "qpg") {
- chip_platform_sdk_target = "${qpg_sdk_build_root}:qpg_sdk"
- }
- if (chip_device_platform == "nxp") {
- chip_platform_sdk_target = "${nxp_sdk_build_root}:nxp_sdk"
- }
- if (chip_device_platform == "cyw30739") {
- chip_platform_sdk_target = "${cyw30739_sdk_build_root}:cyw30739_sdk"
- }
- if (chip_device_platform == "stm32") {
- chip_platform_sdk_target = "${stm32_sdk_build_root}:stm32_sdk"
- }
- if (chip_device_platform == "bl702") {
- chip_platform_sdk_target = "${bouffalolab_iot_sdk_build_root}/bl702:bl_iot_sdk"
- }
- if (chip_device_platform == "bl702l") {
- chip_platform_sdk_target = "${bouffalolab_iot_sdk_build_root}/bl702l:bl_iot_sdk"
- }
- if (chip_device_platform == "mt793x") {
- chip_platform_sdk_target = "${mt793x_sdk_build_root}:mt793x_sdk"
- }
-
- # Add platform here as needed.
- }
- }
-}
-
if (chip_device_platform == "cc13x4_26x4") {
import("//build_overrides/ti_simplelink_sdk.gni")
} else if (chip_device_platform == "efr32") {
@@ -212,8 +174,41 @@ source_set("system_config_header") {
public_deps = []
- if(chip_platform_sdk_target != "") {
- public_deps += [ chip_platform_sdk_target ]
+ if (target_cpu != "esp32") {
+ if (chip_system_config_use_lwip) {
+ public_deps += [ "${lwip_root}:lwip" ]
+ } else {
+ if (chip_device_platform == "efr32") {
+ public_deps += [ "${efr32_sdk_build_root}:efr32_sdk" ]
+ }
+ if (chip_device_platform == "qpg") {
+ public_deps += [ "${qpg_sdk_build_root}:qpg_sdk" ]
+ }
+ if (chip_device_platform == "nxp") {
+ public_deps += [ "${nxp_sdk_build_root}:nxp_sdk" ]
+ }
+ if (chip_device_platform == "cyw30739") {
+ public_deps += [ "${cyw30739_sdk_build_root}:cyw30739_sdk" ]
+ }
+ if (chip_device_platform == "stm32") {
+ public_deps += [ "${stm32_sdk_build_root}:stm32_sdk" ]
+ }
+ if (chip_device_platform == "bl702") {
+ public_deps += [ "${bouffalolab_iot_sdk_build_root}/bl702:bl_iot_sdk" ]
+ }
+ if (chip_device_platform == "bl702l") {
+ public_deps += [ "${bouffalolab_iot_sdk_build_root}/bl702l:bl_iot_sdk" ]
+ }
+ if (chip_external_sdk_target != "") {
+ public_deps += [ "${chip_external_sdk_target}" ]
+ }
+
+ # Add platform here as needed.
+ }
+ }
+
+ if (chip_device_platform == "mt793x") {
+ public_deps += [ "${mt793x_sdk_build_root}:mt793x_sdk" ]
}
}