* Move naming qpg6100 to qpg (project-chip#7936)

* Removal Env overrides sdk root and target IC

.github/workflows/examples-qpg6100.yaml → .github/workflows/examples-qpg.yaml

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2020-2021 Project CHIP Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Build example - QPG6100
+name: Build example - QPG
 
 on:
     push:
@@ -23,12 +23,12 @@ concurrency:
     cancel-in-progress: true
 
 jobs:
-    qpg6100:
-        name: QPG6100
+    qpg:
+        name: QPG
         timeout-minutes: 60
 
         env:
-            BUILD_TYPE: gn_qpg6100
+            BUILD_TYPE: gn_qpg
 
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
@@ -63,11 +63,15 @@ jobs:
             - name: Build example QPG6100 Lock App
               timeout-minutes: 5
               run: scripts/examples/gn_build_example.sh
-                   examples/lock-app/qpg6100 out/lock_app_debug
+                   examples/lock-app/qpg out/lock_app_debug qpg_target_ic=\"qpg6100\"
             - name: Build example QPG6100 Lighting App
               timeout-minutes: 5
               run: scripts/examples/gn_build_example.sh
-                   examples/lighting-app/qpg6100 out/lighting_app_debug
+                   examples/lighting-app/qpg out/lighting_app_debug qpg_target_ic=\"qpg6100\"
+            - name: Build example QPG6100 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\"
             - name: Binary artifact suffix
               id: outsuffix
               uses: haya14busa/action-cond@v1.0.0

.vscode/tasks.json

@@ -117,7 +117,7 @@
         {
             "label": "Build QPG6100 Lock Example",
             "type": "shell",
-            "command": "scripts/examples/gn_build_example.sh examples/lock-app/qpg6100 out/qpg6100_lock_app",
+            "command": "scripts/examples/gn_build_example.sh examples/lock-app/qpg out/qpg6100_lock_app qpg6100",
             "group": "build",
             "problemMatcher": {
                 "base": "$gcc",

BUILD.gn

@@ -166,8 +166,8 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     # Set this to true to enable efr32 builds by default.
     enable_efr32_builds = false
 
-    # Set this to true to enable qpg6100 builds by default.
-    enable_qpg6100_builds = false
+    # Set this to true to enable Qorvo qpg builds by default.
+    enable_qpg_builds = false
 
     # Set this to true to enable k32w builds by default.
     enable_k32w_builds = false
@@ -216,8 +216,8 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     # Build the efr32 lock app example.
     enable_efr32_lock_app_build = enable_efr32_builds
 
-    # Build the qpg6100 lock app example.
-    enable_qpg6100_lock_app_build = enable_qpg6100_builds && !is_debug
+    # Build the qpgxxxx lock app example.
+    enable_qpg_lock_app_build = enable_qpg_builds
 
     # Build the efr32 lighting app example.
     enable_efr32_lighting_app_build = enable_efr32_builds
@@ -335,9 +335,9 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     }
   }
 
-  if (enable_qpg6100_lock_app_build) {
-    group("qpg6100_lock_app") {
-      deps = [ "${chip_root}/examples/lock-app/qpg6100(${chip_root}/config/qpg6100/toolchain:qpg6100_lock_app)" ]
+  if (enable_qpg_lock_app_build) {
+    group("qpg_lock_app") {
+      deps = [ "${chip_root}/examples/lock-app/qpg(${chip_root}/config/qpg/toolchain:qpg_lock_app)" ]
     }
   }
 
@@ -429,8 +429,8 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     if (enable_k32w_shell_app_build) {
       deps += [ ":k32w_shell_app" ]
     }
-    if (enable_qpg6100_lock_app_build) {
-      deps += [ ":qpg6100_lock_app" ]
+    if (enable_qpg_lock_app_build) {
+      deps += [ ":qpg_lock_app" ]
     }
     if (enable_cc13x2x7_26x2x7_lock_app_build) {
       deps += [ ":cc13x2x7_26x2x7_lock_app" ]

README.md

@@ -4,7 +4,7 @@
 
 ![Examples - EFR32](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20EFR32/badge.svg)
 ![Examples - nRF Connect SDK](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20nRF%20Connect%20SDK/badge.svg)
-![Examples - QPG6100](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20QPG6100/badge.svg)
+![Examples - QPG](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20QPG/badge.svg)
 ![Examples - Linux Standalone](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20Linux%20Standalone/badge.svg)
 ![Examples - ESP32](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20ESP32/badge.svg)
 ![Examples - K32W with SE051](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20K32W%20with%20SE051/badge.svg)

examples/build_overrides/qpg6100_sdk.gni → build_overrides/qpg_sdk.gni

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2020-2021 Project CHIP Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,6 +13,6 @@
 # limitations under the License.
 
 declare_args() {
-  # Root directory for QPG6100 SDK.
-  qpg6100_sdk_build_root = "//third_party/connectedhomeip/third_party/qpg_sdk"
+  # Root directory for Qorvo QPGxxxx SDK.
+  qpg_sdk_build_root = "//third_party/qpg_sdk"
 }

config/qpg6100/toolchain/BUILD.gn

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2020-2021 Project CHIP Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,9 +17,16 @@ import("//build_overrides/chip.gni")
 
 import("${build_root}/toolchain/arm_gcc/arm_toolchain.gni")
 
-arm_toolchain("qpg6100_lock_app") {
+arm_toolchain("qpg_lock_app") {
   toolchain_args = {
     current_os = "freertos"
-    import("${chip_root}/examples/lock-app/qpg6100/args.gni")
+    import("${chip_root}/examples/lock-app/qpg/args.gni")
+  }
+}
+
+arm_toolchain("qpg_lighting_app") {
+  toolchain_args = {
+    current_os = "freertos"
+    import("${chip_root}/examples/lighting-app/qpg/args.gni")
   }
 }

build_overrides/qpg6100_sdk.gni → examples/build_overrides/qpg_sdk.gni

@@ -13,6 +13,6 @@
 # limitations under the License.
 
 declare_args() {
-  # Root directory for QPG6100 SDK.
-  qpg6100_sdk_build_root = "//third_party/qpg_sdk"
+  # Root directory for QPG SDK.
+  qpg_sdk_build_root = "//third_party/connectedhomeip/third_party/qpg_sdk"
 }

examples/lighting-app/qpg6100/BUILD.gn → examples/lighting-app/qpg/BUILD.gn

@@ -15,31 +15,31 @@
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 import("//build_overrides/openthread.gni")
-import("//build_overrides/qpg6100_sdk.gni")
+import("//build_overrides/qpg_sdk.gni")
 
 import("${build_root}/config/defaults.gni")
-import("${qpg6100_sdk_build_root}/qpg6100_executable.gni")
-import("${qpg6100_sdk_build_root}/qpg6100_sdk.gni")
+import("${qpg_sdk_build_root}/qpg_executable.gni")
+import("${qpg_sdk_build_root}/qpg_sdk.gni")
 
 assert(current_os == "freertos")
 
-qpg6100_project_dir = "${chip_root}/examples/lighting-app/qpg6100"
-examples_plat_dir = "${chip_root}/examples/platform/qpg6100"
+qpg_project_dir = "${chip_root}/examples/lighting-app/qpg"
+examples_plat_dir = "${chip_root}/examples/platform/qpg"
 
-qpg6100_sdk("sdk") {
+qpg_sdk("sdk") {
   sources = [
     "${examples_plat_dir}/app/include/Service.h",
     "${examples_plat_dir}/project_include/CHIPProjectConfig.h",
   ]
 
   include_dirs = [
-    "${chip_root}/src/platform/qpg6100",
+    "${chip_root}/src/platform/qpg",
     "${examples_plat_dir}/project_include",
   ]
 }
 
-qpg6100_executable("lighting_app") {
-  output_name = "chip-qpg6100-lighting-example.out"
+qpg_executable("lighting_app") {
+  output_name = "chip-${qpg_target_ic}-lighting-example.out"
 
   sources = [
     "${examples_plat_dir}/app/main.cpp",
@@ -62,12 +62,12 @@ qpg6100_executable("lighting_app") {
   cflags = [ "-Wconversion" ]
 
   include_dirs = [
-    "${qpg6100_project_dir}/include/",
+    "${qpg_project_dir}/include/",
     "${examples_plat_dir}",
     "${examples_plat_dir}/app/include",
   ]
 
-  ldscript = "${qpg6100_sdk_root}/qpg6100/ldscripts/chip-qpg6100-example.ld"
+  ldscript = "${qpg_sdk_root}/${qpg_target_ic}/ldscripts/chip-${qpg_target_ic}-example.ld"
 
   inputs = [ ldscript ]
 
@@ -76,10 +76,10 @@ qpg6100_executable("lighting_app") {
   output_dir = root_out_dir
 }
 
-group("qpg6100") {
+group("qpg") {
   deps = [ ":lighting_app" ]
 }
 
 group("default") {
-  deps = [ ":qpg6100" ]
+  deps = [ ":qpg" ]
 }

examples/lighting-app/qpg/README.md

@@ -0,0 +1 @@
+../../platform/qpg/README.md

examples/lighting-app/qpg6100/args.gni → examples/lighting-app/qpg/args.gni

@@ -13,6 +13,6 @@
 # limitations under the License.
 
 import("//build_overrides/chip.gni")
-import("${chip_root}/examples/platform/qpg6100/args.gni")
+import("${chip_root}/examples/platform/qpg/args.gni")
 
-qpg6100_sdk_target = get_label_info(":sdk", "label_no_toolchain")
+qpg_sdk_target = get_label_info(":sdk", "label_no_toolchain")

examples/lighting-app/qpg6100/src/AppTask.cpp → examples/lighting-app/qpg/src/AppTask.cpp

@@ -40,7 +40,7 @@ using namespace chip::DeviceLayer;
 #if CHIP_ENABLE_OPENTHREAD
 #include <platform/OpenThread/OpenThreadUtils.h>
 #include <platform/ThreadStackManager.h>
-#include <platform/qpg6100/ThreadStackManagerImpl.h>
+#include <platform/qpg/ThreadStackManagerImpl.h>
 #define JOINER_START_TRIGGER_TIMEOUT 1500
 #endif
 

examples/lock-app/qpg6100/BUILD.gn → examples/lock-app/qpg/BUILD.gn

@@ -15,31 +15,31 @@
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 import("//build_overrides/openthread.gni")
-import("//build_overrides/qpg6100_sdk.gni")
+import("//build_overrides/qpg_sdk.gni")
 
 import("${build_root}/config/defaults.gni")
-import("${qpg6100_sdk_build_root}/qpg6100_executable.gni")
-import("${qpg6100_sdk_build_root}/qpg6100_sdk.gni")
+import("${qpg_sdk_build_root}/qpg_executable.gni")
+import("${qpg_sdk_build_root}/qpg_sdk.gni")
 
 assert(current_os == "freertos")
 
-qpg6100_project_dir = "${chip_root}/examples/lock-app/qpg6100"
-examples_plat_dir = "${chip_root}/examples/platform/qpg6100"
+qpg_project_dir = "${chip_root}/examples/lock-app/qpg"
+examples_plat_dir = "${chip_root}/examples/platform/qpg"
 
-qpg6100_sdk("sdk") {
+qpg_sdk("sdk") {
   sources = [
     "${examples_plat_dir}/app/include/Service.h",
     "${examples_plat_dir}/project_include/CHIPProjectConfig.h",
   ]
 
   include_dirs = [
-    "${chip_root}/src/platform/qpg6100",
+    "${chip_root}/src/platform/qpg",
     "${examples_plat_dir}/project_include",
   ]
 }
 
-qpg6100_executable("lock_app") {
-  output_name = "chip-qpg6100-lock-example.out"
+qpg_executable("lock_app") {
+  output_name = "chip-${qpg_target_ic}-lock-example.out"
 
   sources = [
     "${examples_plat_dir}/app/main.cpp",
@@ -60,14 +60,14 @@ qpg6100_executable("lock_app") {
   ]
 
   include_dirs = [
-    "${qpg6100_project_dir}/include",
+    "${qpg_project_dir}/include",
     "${examples_plat_dir}",
     "${examples_plat_dir}/app/include",
   ]
 
   cflags = [ "-Wconversion" ]
 
-  ldscript = "${qpg6100_sdk_root}/qpg6100/ldscripts/chip-qpg6100-example.ld"
+  ldscript = "${qpg_sdk_root}/${qpg_target_ic}/ldscripts/chip-${qpg_target_ic}-example.ld"
 
   inputs = [ ldscript ]
 
@@ -76,10 +76,10 @@ qpg6100_executable("lock_app") {
   output_dir = root_out_dir
 }
 
-group("qpg6100") {
+group("qpg") {
   deps = [ ":lock_app" ]
 }
 
 group("default") {
-  deps = [ ":qpg6100" ]
+  deps = [ ":qpg" ]
 }

examples/lock-app/qpg/README.md

@@ -0,0 +1 @@
+../../platform/qpg/README.md

examples/lock-app/qpg6100/args.gni → examples/lock-app/qpg/args.gni

@@ -13,6 +13,6 @@
 # limitations under the License.
 
 import("//build_overrides/chip.gni")
-import("${chip_root}/examples/platform/qpg6100/args.gni")
+import("${chip_root}/examples/platform/qpg/args.gni")
 
-qpg6100_sdk_target = get_label_info(":sdk", "label_no_toolchain")
+qpg_sdk_target = get_label_info(":sdk", "label_no_toolchain")

examples/lock-app/qpg6100/src/AppTask.cpp → examples/lock-app/qpg/src/AppTask.cpp

@@ -41,7 +41,7 @@ using namespace chip::DeviceLayer;
 #if CHIP_ENABLE_OPENTHREAD
 #include <platform/OpenThread/OpenThreadUtils.h>
 #include <platform/ThreadStackManager.h>
-#include <platform/qpg6100/ThreadStackManagerImpl.h>
+#include <platform/qpg/ThreadStackManagerImpl.h>
 #define JOINER_START_TRIGGER_TIMEOUT 1500
 #endif
 

examples/persistent-storage/qpg6100/APPLICATION.md → examples/persistent-storage/qpg/APPLICATION.md

@@ -4,7 +4,7 @@ An example application showing the use of key value storage API on the Qorvo
 QPG6100.
 
 More detailed information to be included in
-[SDK Documentation](../../platform/qpg6100/README.md).
+[SDK Documentation](../../platform/qpg/README.md).
 
 ## Persistent-storage-app
 
@@ -25,8 +25,7 @@ This application does not have any LED output.
 
 ## Logging Output
 
--   See
-    [View Logging Output](../../platform/qpg6100/README.md#view-logging-output)
+-   See [View Logging Output](../../platform/qpg/README.md#view-logging-output)
 -   At startup you will see:
 
 ```