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
project-chip · May 4, 2022 · 2a68ad7 · 2a68ad7
1 parent 9bbb070
commit 2a68ad7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/examples/platform/qpg/project_include/OpenThreadConfig.h b/examples/platform/qpg/project_include/OpenThreadConfig.h
@@ -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"
diff --git a/src/platform/qpg/args.gni b/src/platform/qpg/args.gni
@@ -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",
 ]

diff --git a/third_party/openthread/ot-qorvo b/third_party/openthread/ot-qorvo
diff --git a/third_party/openthread/platforms/qpg/BUILD.gn b/third_party/openthread/platforms/qpg/BUILD.gn
@@ -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") {
+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