From c8cacd58aabfaff58c107cc2dc3eaf43eb1b42ad Mon Sep 17 00:00:00 2001
From: Timothy Maes <timothy.maes@qorvo.com>
Date: Wed, 28 Jun 2023 16:55:03 +0200
Subject: [PATCH] [QPG] Replace qpg6105 with qpg_target_ic and
 qpg_target_board. (#27522)

Removing absolute references for re-use with other targets.
---
 third_party/qpg_sdk/BUILD.gn    | 6 +++---
 third_party/qpg_sdk/qpg_sdk.gni | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/third_party/qpg_sdk/BUILD.gn b/third_party/qpg_sdk/BUILD.gn
index 671804cfa586d3..7a18cb51dbdf2f 100755
--- a/third_party/qpg_sdk/BUILD.gn
+++ b/third_party/qpg_sdk/BUILD.gn
@@ -150,7 +150,7 @@ qpg_make_build("qpg_bootloader") {
     "WORKDIR=" + rebase_path(target_gen_dir, root_build_dir) +
         "/${qpg_sdk_lib_dir}/Bootloader_${qpg_target_ic}_compr_secure",
     "UMB_WORKDIR=" + rebase_path(target_gen_dir, root_build_dir) +
-        "/${qpg_sdk_lib_dir}/UMB_QPG6105DK_B01_nrt_flash_compr_secure",
+        "/${qpg_sdk_lib_dir}/UMB_${qpg_target_board}_nrt_flash_compr_secure",
   ]
 }
 config("qpg_retain_bootloader") {
@@ -169,7 +169,7 @@ static_library("qpg_bootloader_lib") {
 
 qpg_make_build("qpg_openthread_glue") {
   make_sources = [ "${qpg_sdk_root}/Components/Qorvo/Matter" ]
-  make_output = [ "${target_gen_dir}/${qpg_sdk_lib_dir}/OpenThreadQorvoGlue_qpg6105_ftd/libOpenThreadQorvoGlue_${qpg_target_ic}_ftd.a" ]
+  make_output = [ "${target_gen_dir}/${qpg_sdk_lib_dir}/OpenThreadQorvoGlue_${qpg_target_ic}_ftd/libOpenThreadQorvoGlue_${qpg_target_ic}_ftd.a" ]
   make_args = [
     "-f",
     rebase_path(qpg_sdk_root, root_build_dir) + "/Libraries/Qorvo/OpenThreadQorvoGlue/Makefile.OpenThreadQorvoGlue_${qpg_target_ic}_ftd",
@@ -183,7 +183,7 @@ qpg_make_build("qpg_openthread_glue") {
 }
 static_library("qpg_openthread_glue_lib") {
   deps = [ "${chip_root}/third_party/qpg_sdk:qpg_openthread_glue" ]
-  libs = [ "${target_gen_dir}/${qpg_sdk_lib_dir}/OpenThreadQorvoGlue_qpg6105_ftd/libOpenThreadQorvoGlue_${qpg_target_ic}_ftd.a" ]
+  libs = [ "${target_gen_dir}/${qpg_sdk_lib_dir}/OpenThreadQorvoGlue_${qpg_target_ic}_ftd/libOpenThreadQorvoGlue_${qpg_target_ic}_ftd.a" ]
 }
 
 qpg_make_build("qpg_light_factorydata") {
diff --git a/third_party/qpg_sdk/qpg_sdk.gni b/third_party/qpg_sdk/qpg_sdk.gni
index 65c06f3ce67982..a9be7323fcd34c 100644
--- a/third_party/qpg_sdk/qpg_sdk.gni
+++ b/third_party/qpg_sdk/qpg_sdk.gni
@@ -27,6 +27,9 @@ declare_args() {
   # Target IC for QPG SDK
   qpg_target_ic = "qpg6105"
 
+  # Target board for QPG SDK
+  qpg_target_board = "QPG6105DK_B01"
+
   # an option to disable referencing qorvo object archive files (*.a)
   qpg_sdk_include_platform_libs = true