Skip to content

Commit 3ba9ca0

Browse files
author
Wiktor Grajkowski
committed
fix renbase issues
1 parent 2ef9d3e commit 3ba9ca0

File tree

10 files changed

+64
-21
lines changed

10 files changed

+64
-21
lines changed

‎examples/light-switch-app/qpg/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ qpg_executable("light_switch_app") {
137137
}
138138
}
139139

140-
ldscript = "${qpg_sdk_root}/Libraries/Qorvo/QorvoStack/gen/QorvoStack_${qpg_target_ic}/QorvoStack_${qpg_target_ic}.ld"
140+
ldscript = "${qpg_sdk_root}/Libraries/Qorvo/QorvoStack/gen/QorvoStack_${qpg_target_ic}${qpg_flavour}/QorvoStack_${qpg_target_ic}${qpg_flavour}.ld"
141141

142142
inputs = [ ldscript ]
143143

‎examples/lighting-app/qpg/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ qpg_executable("lighting_app") {
140140
}
141141
}
142142

143-
ldscript = "${qpg_sdk_root}/Libraries/Qorvo/QorvoStack/gen/QorvoStack_${qpg_target_ic}/QorvoStack_${qpg_target_ic}.ld"
143+
ldscript = "${qpg_sdk_root}/Libraries/Qorvo/QorvoStack/gen/QorvoStack_${qpg_target_ic}${qpg_flavour}/QorvoStack_${qpg_target_ic}${qpg_flavour}.ld"
144144

145145
inputs = [ ldscript ]
146146

‎examples/lock-app/qpg/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ qpg_executable("lock_app") {
138138
}
139139
}
140140

141-
ldscript = "${qpg_sdk_root}/Libraries/Qorvo/QorvoStack/gen/QorvoStack_${qpg_target_ic}/QorvoStack_${qpg_target_ic}.ld"
141+
ldscript = "${qpg_sdk_root}/Libraries/Qorvo/QorvoStack/gen/QorvoStack_${qpg_target_ic}${qpg_flavour}/QorvoStack_${qpg_target_ic}${qpg_flavour}.ld"
142142

143143
inputs = [ ldscript ]
144144

‎examples/persistent-storage/qpg/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ qpg_executable("persistent_storage_app") {
5858

5959
output_dir = root_out_dir
6060

61-
ldscript = "${qpg_sdk_root}/Libraries/Qorvo/QorvoStack/gen/QorvoStack_${qpg_target_ic}/QorvoStack_${qpg_target_ic}.ld"
61+
ldscript = "${qpg_sdk_root}/Libraries/Qorvo/QorvoStack/gen/QorvoStack_${qpg_target_ic}${qpg_flavour}/QorvoStack_${qpg_target_ic}${qpg_flavour}.ld"
6262

6363
inputs = [ ldscript ]
6464

‎examples/shell/qpg/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ qpg_executable("shell_app") {
6666

6767
defines = []
6868

69-
ldscript = "${qpg_sdk_root}/Libraries/Qorvo/QorvoStack/gen/QorvoStack_${qpg_target_ic}/QorvoStack_${qpg_target_ic}.ld"
69+
ldscript = "${qpg_sdk_root}/Libraries/Qorvo/QorvoStack/gen/QorvoStack_${qpg_target_ic}${qpg_flavour}/QorvoStack_${qpg_target_ic}${qpg_flavour}.ld"
7070

7171
inputs = [ ldscript ]
7272

‎examples/thermostat/qpg/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ qpg_executable("thermostat") {
136136
}
137137
}
138138

139-
ldscript = "${qpg_sdk_root}/Libraries/Qorvo/QorvoStack/gen/QorvoStack_${qpg_target_ic}/QorvoStack_${qpg_target_ic}.ld"
139+
ldscript = "${qpg_sdk_root}/Libraries/Qorvo/QorvoStack/gen/QorvoStack_${qpg_target_ic}${qpg_flavour}/QorvoStack_${qpg_target_ic}${qpg_flavour}.ld"
140140

141141
inputs = [ ldscript ]
142142

‎scripts/build/builders/qpg.py

+12-1
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,24 @@ def GnArgName(self):
8888
raise Exception('Unknown board #: %r' % self)
8989

9090

91+
class QpgFlavour(Enum):
92+
EXT_FLASH = 1
93+
94+
def GnFlavourName(self):
95+
if self == QpgFlavour.EXT_FLASH:
96+
return '_ext_flash'
97+
else:
98+
raise Exception('Unknown flavour #: %r' % self)
99+
100+
91101
class QpgBuilder(GnBuilder):
92102

93103
def __init__(self,
94104
root,
95105
runner,
96106
app: QpgApp = QpgApp.LIGHT,
97107
board: QpgBoard = QpgBoard.QPG6105,
108+
flavour: QpgFlavour = QpgFlavour.EXT_FLASH,
98109
enable_rpcs: bool = False,
99110
update_image: bool = False):
100111
super(QpgBuilder, self).__init__(
@@ -106,7 +117,7 @@ def __init__(self,
106117
self.update_image = update_image
107118

108119
def GnBuildArgs(self):
109-
args = ['qpg_target_ic=\"%s\"' % self.board.GnArgName()]
120+
args = ['qpg_target_ic=\"%s\" qpg_flavour=\"%s\"' % (self.board.GnArgName(), self.flavour.GnFlavourName())]
110121
if self.enable_rpcs:
111122
args.append('import("//with_pw_rpc.gni")')
112123
if self.update_image:

‎third_party/qpg_sdk/BUILD.gn

+15-11
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@ static_library("qpg_mbedtls_alt_lib") {
102102

103103
qpg_make_build("qpg_stack") {
104104
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" ]
106106
make_args = [
107107
"-f",
108108
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}",
110110
"FREERTOS_REPO_DIR=" + rebase_path(chip_root, root_build_dir) +
111111
"/third_party/freertos/repo",
112112
"WORKDIR=" + rebase_path(target_gen_dir, root_build_dir) +
@@ -116,15 +116,15 @@ qpg_make_build("qpg_stack") {
116116

117117
static_library("qpg_stack_lib") {
118118
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" ]
120120
}
121121

122122
qpg_make_build("qpg_glue") {
123123
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" ]
125125
make_args = [
126126
"-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",
128128
"FREERTOS_REPO_DIR=" + rebase_path(chip_root, root_build_dir) +
129129
"/third_party/freertos/repo",
130130
"WORKDIR=" + rebase_path(target_gen_dir, root_build_dir) +
@@ -133,24 +133,28 @@ qpg_make_build("qpg_glue") {
133133
}
134134
static_library("qpg_glue_lib") {
135135
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+
}
137141
}
138142

139143
# openthread toevoegen
140144
# bootloader build
141145
#
142146
qpg_make_build("qpg_bootloader") {
143147
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" ]
145149
make_args = [
146150
"-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",
148152
"FREERTOS_REPO_DIR=" + rebase_path(chip_root, root_build_dir) +
149153
"/third_party/freertos/repo",
150154
"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",
152156
"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",
154158
]
155159
}
156160
config("qpg_retain_bootloader") {
@@ -163,7 +167,7 @@ config("qpg_retain_bootloader") {
163167

164168
static_library("qpg_bootloader_lib") {
165169
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" ]
167171
public_configs = [ ":qpg_retain_bootloader" ]
168172
}
169173

‎third_party/qpg_sdk/qpg_platform.gni

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Copyright (c) 2020 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
import("//build_overrides/chip.gni")
16+
import("${chip_root}/src/crypto/crypto.gni")
17+
18+
declare_args() {
19+
# QPG chip
20+
qpg_target_ic = "unset"
21+
qpg_flavour = ""
22+
}
23+
24+
if (qpg_target_ic == "qpg6105") {
25+
mbedtls_alt_enabled = true
26+
arm_float_abi = "soft"
27+
arm_arch = "armv7e-m"
28+
} else {
29+
assert(qpg_target_ic != "", "qpg_target_ic must be specified")
30+
}

‎third_party/qpg_sdk/qpg_sdk.gni

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import("//build_overrides/chip.gni")
1616
import("//build_overrides/jlink.gni")
1717
import("//build_overrides/openthread.gni")
1818
import("//build_overrides/qpg_sdk.gni")
19+
import("qpg_platform.gni")
1920

2021
declare_args() {
2122
# Location of the QPG SDK.
@@ -36,9 +37,6 @@ declare_args() {
3637
# Enable Sleepy end device
3738
enable_sleepy_device = false
3839

39-
# Enable mbedtls HW acceleration
40-
mbedtls_alt_enabled = true
41-
4240
# OTA parameters
4341
matter_device_vid = ""
4442
matter_device_pid = ""

0 commit comments

Comments
 (0)