Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ot-qorvo repo and remove some workarounds #13079

Merged
merged 10 commits into from
Dec 16, 2021
Merged

Update ot-qorvo repo and remove some workarounds #13079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4e91517
Replace QPG6100 by the new QPG6105
lucicop Dec 14, 2021
6f7f863
Remove commented code
lucicop Dec 14, 2021
b2d666d
Adjusting chip name in builder scripts
lucicop Dec 14, 2021
8179948
Adjusting chip name in builder scripts - map naming
lucicop Dec 14, 2021
55928a9
Correct formatting
lucicop Dec 14, 2021
89af144
Add reference to updated ot-qorvo repo
lucicop Dec 16, 2021
a94d6ee
Merge branch 'master' of https://github.com/project-chip/connectedhom…
lucicop Dec 16, 2021
1f730c3
Merge branch 'project-chip:master' into update_family
lucicop Dec 16, 2021
e61f49f
Remove hardcoded target ic
lucicop Dec 16, 2021
8b99670
Merge branch 'update_family' of https://github.com/lucicop/connectedh…
lucicop Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/platform/qpg/project_include/OpenThreadConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,4 @@
// NB: This file gets included during the build of OpenThread. Hence
// it cannot use "openthread" in the path to the included file.
//
#include "openthread-core-qpg6100-config.h"
#include "openthread-core-qpg6105-config.h"
4 changes: 2 additions & 2 deletions src/platform/qpg/args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ chip_build_tests = false
chip_enable_rotating_device_id = false

openthread_external_mbedtls = mbedtls_target
openthread_project_core_config_file = "openthread-core-qpg6100-config.h"
openthread_project_core_config_file = "openthread-core-qpg6105-config.h"
openthread_core_config_platform_check_file =
"openthread-core-qpg6100-config-check.h"
"openthread-core-qpg6105-config-check.h"
openthread_core_config_deps = [
"${chip_root}/third_party/openthread/platforms/qpg:libopenthread-qpg-config",
]
Expand Down
2 changes: 1 addition & 1 deletion third_party/openthread/ot-qorvo
Open in desktop
Submodule ot-qorvo updated 47 files
+2 −2 .github/workflows/build.yml
+49 −0 .gitignore
+10 −8 CMakeLists.txt
+2 −1 README.md
+36 −0 etc/options.cmake
+1 −1 openthread
+7 −6 script/build
+1 −1 script/test
+72 −8 src/gp712/CMakeLists.txt
+44 −0 src/gp712/crypto/gp712-mbedtls-config.h
+385 −0 src/gp712/uart-socket.c
+57 −7 src/qpg6095/CMakeLists.txt
+13 −3 src/qpg6095/crypto/qpg6095-mbedtls-config.h
+57 −7 src/qpg6100/CMakeLists.txt
+13 −3 src/qpg6100/crypto/qpg6100-mbedtls-config.h
+0 −3 src/qpg6100/platform.c
+96 −0 src/qpg6105/CMakeLists.txt
+62 −0 src/qpg6105/alarm.c
+78 −0 src/qpg6105/alarm_qorvo.h
+42 −0 src/qpg6105/arm-none-eabi.cmake
+230 −0 src/qpg6105/crypto/aes_alt.h
+163 −0 src/qpg6105/crypto/ccm_alt.h
+233 −0 src/qpg6105/crypto/ecjpake_alt.h
+657 −0 src/qpg6105/crypto/ecp_alt.h
+44 −0 src/qpg6105/crypto/qpg6105-mbedtls-config.h
+194 −0 src/qpg6105/crypto/sha256_alt.h
+78 −0 src/qpg6105/diag.c
+49 −0 src/qpg6105/entropy.c
+50 −0 src/qpg6105/logging.c
+49 −0 src/qpg6105/misc.c
+43 −0 src/qpg6105/misc_qorvo.h
+40 −0 src/qpg6105/openthread-core-qpg6105-config-check.h
+53 −0 src/qpg6105/openthread-core-qpg6105-config.h
+89 −0 src/qpg6105/platform.c
+59 −0 src/qpg6105/platform_qorvo.h
+420 −0 src/qpg6105/radio.c
+220 −0 src/qpg6105/radio_qorvo.h
+56 −0 src/qpg6105/random_qorvo.h
+129 −0 src/qpg6105/settings.cpp
+59 −0 src/qpg6105/settings_qorvo.h
+90 −0 src/qpg6105/uart.c
+89 −0 src/qpg6105/uart_qorvo.h
+72 −8 src/qpg7015m/CMakeLists.txt
+44 −0 src/qpg7015m/crypto/qpg7015m-mbedtls-config.h
+0 −34 src/qpg7015m/logging.c
+385 −0 src/qpg7015m/uart-socket.c
+20 −8 third_party/Qorvo/CMakeLists.txt
3 changes: 1 addition & 2 deletions third_party/openthread/platforms/qpg/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ import("//build_overrides/qpg_sdk.gni")
import("${qpg_sdk_build_root}/qpg_sdk.gni")

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

config("openthread_qpg_config") {
Expand Down