@@ -102,11 +102,11 @@ static_library("qpg_mbedtls_alt_lib") {
102
102
103
103
qpg_make_build (" qpg_stack" ) {
104
104
make_sources = [ " ${ qpg_sdk_root } /Components/Qorvo" ]
105
- make_output = [ " ${ target_gen_dir } /${ qpg_sdk_lib_dir } /QorvoStack/libQorvoStack_${ qpg_target_ic } .a" ]
105
+ make_output = [ " ${ target_gen_dir } /${ qpg_sdk_lib_dir } /QorvoStack/libQorvoStack_${ qpg_target_ic } ${ qpg_flavour } .a" ]
106
106
make_args = [
107
107
" -f" ,
108
108
rebase_path (qpg_sdk_root , root_build_dir ) +
109
- " /Libraries/Qorvo/QorvoStack/Makefile.QorvoStack_${ qpg_target_ic } " ,
109
+ " /Libraries/Qorvo/QorvoStack/Makefile.QorvoStack_${ qpg_target_ic } ${ qpg_flavour } " ,
110
110
" FREERTOS_REPO_DIR=" + rebase_path (chip_root , root_build_dir ) +
111
111
" /third_party/freertos/repo" ,
112
112
" WORKDIR=" + rebase_path (target_gen_dir , root_build_dir ) +
@@ -116,15 +116,15 @@ qpg_make_build("qpg_stack") {
116
116
117
117
static_library (" qpg_stack_lib" ) {
118
118
deps = [ " ${ chip_root } /third_party/qpg_sdk:qpg_stack" ]
119
- libs = [ " ${ target_gen_dir } /${ qpg_sdk_lib_dir } /QorvoStack/libQorvoStack_${ qpg_target_ic } .a" ]
119
+ libs = [ " ${ target_gen_dir } /${ qpg_sdk_lib_dir } /QorvoStack/libQorvoStack_${ qpg_target_ic } ${ qpg_flavour } .a" ]
120
120
}
121
121
122
122
qpg_make_build (" qpg_glue" ) {
123
123
make_sources = [ " ${ qpg_sdk_root } /Components/Qorvo/Matter" ]
124
- make_output = [ " ${ target_gen_dir } /${ qpg_sdk_lib_dir } /MatterQorvoGlue/libMatterQorvoGlue_${ qpg_target_ic } _libbuild.a" ]
124
+ make_output = [ " ${ target_gen_dir } /${ qpg_sdk_lib_dir } /MatterQorvoGlue/libMatterQorvoGlue_${ qpg_target_ic } ${ qpg_flavour } _libbuild.a" ]
125
125
make_args = [
126
126
" -f" ,
127
- rebase_path (qpg_sdk_root , root_build_dir ) + " /Libraries/Qorvo/MatterQorvoGlue/Makefile.MatterQorvoGlue_${ qpg_target_ic } _libbuild" ,
127
+ rebase_path (qpg_sdk_root , root_build_dir ) + " /Libraries/Qorvo/MatterQorvoGlue/Makefile.MatterQorvoGlue_${ qpg_target_ic } ${ qpg_flavour } _libbuild" ,
128
128
" FREERTOS_REPO_DIR=" + rebase_path (chip_root , root_build_dir ) +
129
129
" /third_party/freertos/repo" ,
130
130
" WORKDIR=" + rebase_path (target_gen_dir , root_build_dir ) +
@@ -133,24 +133,28 @@ qpg_make_build("qpg_glue") {
133
133
}
134
134
static_library (" qpg_glue_lib" ) {
135
135
deps = [ " ${ chip_root } /third_party/qpg_sdk:qpg_glue" ]
136
- libs = [ " ${ target_gen_dir } /${ qpg_sdk_lib_dir } /MatterQorvoGlue/libMatterQorvoGlue_${ qpg_target_ic } _libbuild.a" ]
136
+ if (qpg_target_ic == " qpg6105" ) {
137
+ libs = [ " ${ target_gen_dir } /${ qpg_sdk_lib_dir } /MatterQorvoGlue/libMatterQorvoGlue_${ qpg_target_ic } ${ qpg_flavour } _libbuild.a" ]
138
+ } else {
139
+ assert (false , " QPG target not specified" )
140
+ }
137
141
}
138
142
139
143
# openthread toevoegen
140
144
# bootloader build
141
145
#
142
146
qpg_make_build (" qpg_bootloader" ) {
143
147
make_sources = [ " ${ qpg_sdk_root } /Libraries/Qorvo/Bootloader" ]
144
- make_output = [ " ${ target_gen_dir } /${ qpg_sdk_lib_dir } /Bootloader_ ${ qpg_target_ic } _compr_secure/libBootloader_ ${ qpg_target_ic } _compr_secure.a" ]
148
+ make_output = [ " ${ target_gen_dir } /${ qpg_sdk_lib_dir } /BootloaderSections_ ${ qpg_target_ic } _compr_secure/libBootloaderSections_ ${ qpg_target_ic } _compr_secure.a" ]
145
149
make_args = [
146
150
" -f" ,
147
- rebase_path (qpg_sdk_root , root_build_dir ) + " /Libraries/Qorvo/Bootloader/Makefile.Bootloader_ ${ qpg_target_ic } _compr_secure" ,
151
+ rebase_path (qpg_sdk_root , root_build_dir ) + " /Libraries/Qorvo/Bootloader/Makefile.BootloaderSections_ ${ qpg_target_ic } _compr_secure" ,
148
152
" FREERTOS_REPO_DIR=" + rebase_path (chip_root , root_build_dir ) +
149
153
" /third_party/freertos/repo" ,
150
154
" WORKDIR=" + rebase_path (target_gen_dir , root_build_dir ) +
151
- " /${ qpg_sdk_lib_dir } /Bootloader_ ${ qpg_target_ic } _compr_secure" ,
155
+ " /${ qpg_sdk_lib_dir } /BootloaderSections_ ${ qpg_target_ic } _compr_secure" ,
152
156
" UMB_WORKDIR=" + rebase_path (target_gen_dir , root_build_dir ) +
153
- " /${ qpg_sdk_lib_dir } /UMB_ ${ qpg_target_board } _nrt_flash_compr_secure " ,
157
+ " /${ qpg_sdk_lib_dir } /Bootloader_QPG6105DK_B01_nrt_flash_compr_secure " ,
154
158
]
155
159
}
156
160
config (" qpg_retain_bootloader" ) {
@@ -163,7 +167,7 @@ config("qpg_retain_bootloader") {
163
167
164
168
static_library (" qpg_bootloader_lib" ) {
165
169
deps = [ " ${ chip_root } /third_party/qpg_sdk:qpg_bootloader" ]
166
- libs = [ " ${ target_gen_dir } /${ qpg_sdk_lib_dir } /Bootloader_ ${ qpg_target_ic } _compr_secure/libBootloader_ ${ qpg_target_ic } _compr_secure.a" ]
170
+ libs = [ " ${ target_gen_dir } /${ qpg_sdk_lib_dir } /BootloaderSections_ ${ qpg_target_ic } _compr_secure/libBootloaderSections_ ${ qpg_target_ic } _compr_secure.a" ]
167
171
public_configs = [ " :qpg_retain_bootloader" ]
168
172
}
169
173
0 commit comments