Skip to content

Commit 1067785

Browse files
lucicoppull[bot]
authored andcommitted
Update ot-qorvo repo and remove some workarounds (#13079)
* Replace QPG6100 by the new QPG6105 * Remove commented code * Adjusting chip name in builder scripts * Adjusting chip name in builder scripts - map naming * Correct formatting * Add reference to updated ot-qorvo repo * Remove hardcoded target ic
1 parent a9182dc commit 1067785

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

examples/platform/qpg/project_include/OpenThreadConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,4 @@
8686
// NB: This file gets included during the build of OpenThread. Hence
8787
// it cannot use "openthread" in the path to the included file.
8888
//
89-
#include "openthread-core-qpg6100-config.h"
89+
#include "openthread-core-qpg6105-config.h"

src/platform/qpg/args.gni

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ chip_build_tests = false
4444
chip_enable_rotating_device_id = false
4545

4646
openthread_external_mbedtls = mbedtls_target
47-
openthread_project_core_config_file = "openthread-core-qpg6100-config.h"
47+
openthread_project_core_config_file = "openthread-core-qpg6105-config.h"
4848
openthread_core_config_platform_check_file =
49-
"openthread-core-qpg6100-config-check.h"
49+
"openthread-core-qpg6105-config-check.h"
5050
openthread_core_config_deps = [
5151
"${chip_root}/third_party/openthread/platforms/qpg:libopenthread-qpg-config",
5252
]

third_party/openthread/platforms/qpg/BUILD.gn

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ import("//build_overrides/qpg_sdk.gni")
1919
import("${qpg_sdk_build_root}/qpg_sdk.gni")
2020

2121
# QPGxxxx settings and OT glue code
22-
openthread_qpg_family = "qpg6100" # pointing to qpg6100 for now, until ot-qorvo
23-
# is updated with qpg6105 files
22+
openthread_qpg_family = "${qpg_target_ic}"
2423
openthread_qpg_root = "${chip_root}/third_party/openthread/ot-qorvo"
2524

2625
config("openthread_qpg_config") {

0 commit comments

Comments
 (0)