From 4e91517da6014ec86c1204b34950b001defbdec0 Mon Sep 17 00:00:00 2001 From: Lucian Copat Date: Tue, 14 Dec 2021 15:06:03 +0100 Subject: [PATCH 1/7] Replace QPG6100 by the new QPG6105 --- .github/workflows/examples-qpg.yaml | 24 +++++++++---------- examples/lighting-app/qpg/APPLICATION.md | 6 ++--- examples/lock-app/qpg/APPLICATION.md | 6 ++--- .../persistent-storage/qpg/APPLICATION.md | 4 ++-- examples/platform/qpg/README.md | 4 ++-- src/platform/qpg/qpgConfig.cpp | 2 +- third_party/openthread/platforms/qpg/BUILD.gn | 3 ++- third_party/qpg_sdk/BUILD.gn | 2 +- third_party/qpg_sdk/qpg_sdk.gni | 2 +- third_party/qpg_sdk/repo | 2 +- 10 files changed, 28 insertions(+), 27 deletions(-) diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml index 724511050e74a1..c9f38764b8ec9e 100644 --- a/.github/workflows/examples-qpg.yaml +++ b/.github/workflows/examples-qpg.yaml @@ -60,30 +60,30 @@ jobs: path: | .environment/gn_out/.ninja_log .environment/pigweed-venv/*.log - - name: Build example QPG6100 Lock App + - name: Build example QPG6105 Lock App timeout-minutes: 5 run: | - scripts/examples/gn_build_example.sh examples/lock-app/qpg out/lock_app_debug qpg_target_ic=\"qpg6100\" + scripts/examples/gn_build_example.sh examples/lock-app/qpg out/lock_app_debug qpg_target_ic=\"qpg6105\" .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ - qpg qpg6100+debug lock-app \ - out/lock_app_debug/chip-qpg6100-lock-example.out \ + qpg qpg6105+debug lock-app \ + out/lock_app_debug/chip-qpg6105-lock-example.out \ /tmp/bloat_reports/ - - name: Build example QPG6100 Lighting App + - name: Build example QPG6105 Lighting App timeout-minutes: 5 run: | - scripts/examples/gn_build_example.sh examples/lighting-app/qpg out/lighting_app_debug qpg_target_ic=\"qpg6100\" + scripts/examples/gn_build_example.sh examples/lighting-app/qpg out/lighting_app_debug qpg_target_ic=\"qpg6105\" .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ - qpg qpg6100+debug lighting-app \ - out/lighting_app_debug/chip-qpg6100-lighting-example.out \ + qpg qpg6105+debug lighting-app \ + out/lighting_app_debug/chip-qpg6105-lighting-example.out \ /tmp/bloat_reports/ - - name: Build example QPG6100 persistent-storage + - name: Build example QPG6105 persistent-storage timeout-minutes: 5 run: | scripts/examples/gn_build_example.sh examples/persistent-storage/qpg out/persistent-storage_app_debug \ - qpg_target_ic=\"qpg6100\" + qpg_target_ic=\"qpg6105\" .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \ - qpg qpg6100+debug persistent-storage-app \ - out/persistent-storage_app_debug/chip-qpg6100-persistent_storage-example.out \ + qpg qpg6105+debug persistent-storage-app \ + out/persistent-storage_app_debug/chip-qpg6105-persistent_storage-example.out \ /tmp/bloat_reports/ - name: Build Matter SDK library timeout-minutes: 5 diff --git a/examples/lighting-app/qpg/APPLICATION.md b/examples/lighting-app/qpg/APPLICATION.md index be81a5682a7da9..b3034c6389344d 100644 --- a/examples/lighting-app/qpg/APPLICATION.md +++ b/examples/lighting-app/qpg/APPLICATION.md @@ -1,16 +1,16 @@ -# Matter QPG6100 Lighting Example Application +# Matter QPG6105 Lighting Example Application ## Lighting-app A lighting example application showing the use of -[Matter](https://github.com/project-chip/connectedhomeip) on the Qorvo QPG6100 +[Matter](https://github.com/project-chip/connectedhomeip) on the Qorvo QPG6105 can be found in the [Qorvo Matter Documentation repository](https://github.com/Qorvo/qpg-connectedhomeip/blob/master/examples/lighting-app/APPLICATION.md). ## Qorvo SDK More detailed information on the Qorvo SDK can be found in the -[Qorvo Matter Documentation repository](https://github.com/Qorvo/qpg-connectedhomeip/blob/master/qpg6100/doc/README.md). +[Qorvo Matter Documentation repository](https://github.com/Qorvo/qpg-connectedhomeip/blob/master/qpg6105/doc/README.md). ## More information diff --git a/examples/lock-app/qpg/APPLICATION.md b/examples/lock-app/qpg/APPLICATION.md index c6025dd9ebf56b..da70eea728e3e1 100644 --- a/examples/lock-app/qpg/APPLICATION.md +++ b/examples/lock-app/qpg/APPLICATION.md @@ -1,16 +1,16 @@ -# Matter QPG6100 Lock Example Application +# Matter QPG6105 Lock Example Application ## Lock-app A lock example application showing the use of -[Matter](https://github.com/project-chip/connectedhomeip) on the Qorvo QPG6100 +[Matter](https://github.com/project-chip/connectedhomeip) on the Qorvo QPG6105 can be found in the [Qorvo Matter Documentation repository](https://github.com/Qorvo/qpg-connectedhomeip/blob/master/examples/lock-app/APPLICATION.md). ## Qorvo SDK More detailed information on the Qorvo SDK can be found in the -[Qorvo Matter Documentation repository](https://github.com/Qorvo/qpg-connectedhomeip/blob/master/qpg6100/doc/README.md). +[Qorvo Matter Documentation repository](https://github.com/Qorvo/qpg-connectedhomeip/blob/master/qpg6105/doc/README.md). ## More information diff --git a/examples/persistent-storage/qpg/APPLICATION.md b/examples/persistent-storage/qpg/APPLICATION.md index 56483fcd04515e..b776d01fa6a3a6 100644 --- a/examples/persistent-storage/qpg/APPLICATION.md +++ b/examples/persistent-storage/qpg/APPLICATION.md @@ -1,7 +1,7 @@ -# CHIP QPG6100 Persistent Storage Application +# CHIP QPG6105 Persistent Storage Application An example application showing the use of key value storage API on the Qorvo -QPG6100. +QPG6105. More detailed information to be included in [SDK Documentation](../../platform/qpg/README.md). diff --git a/examples/platform/qpg/README.md b/examples/platform/qpg/README.md index 2ad1a3c49a7f84..1ac9c22b4f9035 100644 --- a/examples/platform/qpg/README.md +++ b/examples/platform/qpg/README.md @@ -1,9 +1,9 @@ -# Matter QPG6100 SDK +# Matter QPG6105 SDK ## Qorvo SDK More detailed information on the Qorvo SDK can be found in the -[Qorvo Matter Documentation repository](https://github.com/Qorvo/qpg-connectedhomeip/blob/master/qpg6100/doc/README.md). +[Qorvo Matter Documentation repository](https://github.com/Qorvo/qpg-connectedhomeip/blob/master/qpg6105/doc/README.md). ## More information diff --git a/src/platform/qpg/qpgConfig.cpp b/src/platform/qpg/qpgConfig.cpp index bb5795e1ed2025..45f48e2d3a4ac3 100644 --- a/src/platform/qpg/qpgConfig.cpp +++ b/src/platform/qpg/qpgConfig.cpp @@ -40,7 +40,7 @@ namespace Internal { CHIP_ERROR QPGConfig::Init() { - qvCHIP_Nvm_Init(); + qvCHIP_KvsInit(); return CHIP_NO_ERROR; } diff --git a/third_party/openthread/platforms/qpg/BUILD.gn b/third_party/openthread/platforms/qpg/BUILD.gn index f87607b062e249..b82486eece29dd 100644 --- a/third_party/openthread/platforms/qpg/BUILD.gn +++ b/third_party/openthread/platforms/qpg/BUILD.gn @@ -19,7 +19,8 @@ import("//build_overrides/qpg_sdk.gni") import("${qpg_sdk_build_root}/qpg_sdk.gni") # QPGxxxx settings and OT glue code -openthread_qpg_family = "${qpg_target_ic}" +#openthread_qpg_family = "${qpg_target_ic}" +openthread_qpg_family = "qpg6100" openthread_qpg_root = "${chip_root}/third_party/openthread/ot-qorvo" config("openthread_qpg_config") { diff --git a/third_party/qpg_sdk/BUILD.gn b/third_party/qpg_sdk/BUILD.gn index e282c6255c2945..ce2d987151e179 100755 --- a/third_party/qpg_sdk/BUILD.gn +++ b/third_party/qpg_sdk/BUILD.gn @@ -34,7 +34,7 @@ group("qpg_sdk") { config("qpg_freertos_config") { include_dirs = [ "${qpg_sdk_root}/${qpg_target_ic}/comps/gpFreeRTOS/config", - "${chip_root}/third_party/qpg_sdk/repo/qpg6100/comps/lwip", + "${chip_root}/third_party/qpg_sdk/repo/${qpg_target_ic}/comps/lwip", "${freertos_root}/repo/portable/GCC/ARM_CM3", ] } diff --git a/third_party/qpg_sdk/qpg_sdk.gni b/third_party/qpg_sdk/qpg_sdk.gni index 3c980f3b0c106e..5b8385cee44a91 100644 --- a/third_party/qpg_sdk/qpg_sdk.gni +++ b/third_party/qpg_sdk/qpg_sdk.gni @@ -23,7 +23,7 @@ declare_args() { qpg_sdk_root = "${chip_root}/third_party/qpg_sdk/repo" # Target IC for QPG SDK - qpg_target_ic = "qpg6100" + qpg_target_ic = "qpg6105" } assert(qpg_sdk_root != "", "qpg_sdk_root must be specified") diff --git a/third_party/qpg_sdk/repo b/third_party/qpg_sdk/repo index 8742616cc7e8fe..edb134291c9f0c 160000 --- a/third_party/qpg_sdk/repo +++ b/third_party/qpg_sdk/repo @@ -1 +1 @@ -Subproject commit 8742616cc7e8fef7ec40241b9d6ff550627e0500 +Subproject commit edb134291c9f0cb661c2e95dcf643cd334dca810 From 6f7f8638b8224ced558344b0c1bae56b25bfc42c Mon Sep 17 00:00:00 2001 From: Lucian Copat Date: Tue, 14 Dec 2021 15:23:50 +0100 Subject: [PATCH 2/7] Remove commented code --- third_party/openthread/platforms/qpg/BUILD.gn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/third_party/openthread/platforms/qpg/BUILD.gn b/third_party/openthread/platforms/qpg/BUILD.gn index b82486eece29dd..b5b62539545379 100644 --- 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 = "${qpg_target_ic}" -openthread_qpg_family = "qpg6100" +openthread_qpg_family = "qpg6100" # pointing to qpg6100 for now, until ot-qorvo is updated with qpg6105 files openthread_qpg_root = "${chip_root}/third_party/openthread/ot-qorvo" config("openthread_qpg_config") { From b2d666d15411b5ccbb2a41e8800d0dd8ca414ef1 Mon Sep 17 00:00:00 2001 From: Lucian Copat Date: Tue, 14 Dec 2021 15:26:11 +0100 Subject: [PATCH 3/7] Adjusting chip name in builder scripts --- scripts/build/builders/qpg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build/builders/qpg.py b/scripts/build/builders/qpg.py index 425d0f4a9ee40c..231db8c8ff49f6 100644 --- a/scripts/build/builders/qpg.py +++ b/scripts/build/builders/qpg.py @@ -27,7 +27,7 @@ def __init__(self, root, runner): def build_outputs(self): return { 'chip-qpg-lock-example.out': - os.path.join(self.output_dir, 'chip-qpg6100-lock-example.out'), + os.path.join(self.output_dir, 'chip-qpg6105-lock-example.out'), 'chip-qpg-lock-example.out.map': os.path.join(self.output_dir, 'chip-qpg6100-lock-example.out.map'), From 8179948cdee0477a877e88b70d476c07db81df8b Mon Sep 17 00:00:00 2001 From: Lucian Copat Date: Tue, 14 Dec 2021 15:30:22 +0100 Subject: [PATCH 4/7] Adjusting chip name in builder scripts - map naming --- scripts/build/builders/qpg.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/build/builders/qpg.py b/scripts/build/builders/qpg.py index 231db8c8ff49f6..fe9c4d3fdd6e6f 100644 --- a/scripts/build/builders/qpg.py +++ b/scripts/build/builders/qpg.py @@ -29,6 +29,5 @@ def build_outputs(self): 'chip-qpg-lock-example.out': os.path.join(self.output_dir, 'chip-qpg6105-lock-example.out'), 'chip-qpg-lock-example.out.map': - os.path.join(self.output_dir, - 'chip-qpg6100-lock-example.out.map'), + os.path.join(self.output_dir, 'chip-qpg6105-lock-example.out.map'), } From 55928a99b73b0d3b28d06542ab6ba66c16d41c92 Mon Sep 17 00:00:00 2001 From: Lucian Copat Date: Tue, 14 Dec 2021 16:16:46 +0100 Subject: [PATCH 5/7] Correct formatting --- third_party/openthread/platforms/qpg/BUILD.gn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/third_party/openthread/platforms/qpg/BUILD.gn b/third_party/openthread/platforms/qpg/BUILD.gn index b5b62539545379..b4a50f19a1d52d 100644 --- a/third_party/openthread/platforms/qpg/BUILD.gn +++ b/third_party/openthread/platforms/qpg/BUILD.gn @@ -19,7 +19,8 @@ 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 = "qpg6100" # pointing to qpg6100 for now, until ot-qorvo + # is updated with qpg6105 files openthread_qpg_root = "${chip_root}/third_party/openthread/ot-qorvo" config("openthread_qpg_config") { From 89af144e2746be3600be05adfd7ec7d5a29848d8 Mon Sep 17 00:00:00 2001 From: Lucian Copat Date: Thu, 16 Dec 2021 13:37:17 +0100 Subject: [PATCH 6/7] Add reference to updated ot-qorvo repo --- examples/platform/qpg/project_include/OpenThreadConfig.h | 2 +- src/platform/qpg/args.gni | 4 ++-- third_party/openthread/ot-qorvo | 2 +- third_party/openthread/platforms/qpg/BUILD.gn | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/examples/platform/qpg/project_include/OpenThreadConfig.h b/examples/platform/qpg/project_include/OpenThreadConfig.h index 44610cc1ee5b96..d4c29a26b7c43d 100644 --- 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 index a051e30b87bbbc..c818cd6168f99e 100644 --- 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 index fc44db085e6e3d..db1990748c4f80 160000 --- a/third_party/openthread/ot-qorvo +++ b/third_party/openthread/ot-qorvo @@ -1 +1 @@ -Subproject commit fc44db085e6e3d95496f91432038914c4a294cce +Subproject commit db1990748c4f801e75b2763ae492a1b37184d57a diff --git a/third_party/openthread/platforms/qpg/BUILD.gn b/third_party/openthread/platforms/qpg/BUILD.gn index b4a50f19a1d52d..f87607b062e249 100644 --- 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") { From e61f49f1d165c4107cf360c952e53614bafd98f2 Mon Sep 17 00:00:00 2001 From: Lucian Copat Date: Thu, 16 Dec 2021 14:36:34 +0100 Subject: [PATCH 7/7] Remove hardcoded target ic --- third_party/openthread/platforms/qpg/BUILD.gn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/third_party/openthread/platforms/qpg/BUILD.gn b/third_party/openthread/platforms/qpg/BUILD.gn index b4a50f19a1d52d..f87607b062e249 100644 --- 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") {