From 2a68ad73c15cc946fcc41db118ef299ca116ed07 Mon Sep 17 00:00:00 2001
From: lucicop <lucicop2001@yahoo.com>
Date: Thu, 16 Dec 2021 17:00:16 +0200
Subject: [PATCH] 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
---
 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") {