Skip to content

Commit 9885593

Browse files
wy-hhpull[bot]
authored andcommitted
[Bouffalolab] Load BLE TX power configuration from flash (#29276)
* load ble tx power from flash configuration * change config name * fix compile error * fix restyle
1 parent da15a58 commit 9885593

File tree

3 files changed

+31
-2
lines changed

3 files changed

+31
-2
lines changed

third_party/bouffalolab/bl602/bl_iot_sdk.gni

+2
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ template("bl_iot_sdk") {
203203
}
204204

205205
source_set("${sdk_target_name}_hosal") {
206+
defines = [ "CFG_BLE_ENABLE" ]
206207
sources = [
207208
"${bl_iot_sdk_root}/components/platform/hosal/bl602_hal/bl_adc.c",
208209
"${bl_iot_sdk_root}/components/platform/hosal/bl602_hal/bl_boot2.c",
@@ -282,6 +283,7 @@ template("bl_iot_sdk") {
282283
":${sdk_target_name}_config_fs",
283284
":${sdk_target_name}_config_utils",
284285
":${sdk_target_name}_config_freertos",
286+
":${sdk_target_name}_config_ble",
285287
]
286288
public_configs = [
287289
":${sdk_target_name}_config",

third_party/bouffalolab/bl702/bl_iot_sdk.gni

+13-1
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,11 @@ template("bl_iot_sdk") {
260260
"DISABLE_PRINT=1",
261261
]
262262

263+
if (defined(invoker.chip_config_network_layer_ble) &&
264+
invoker.chip_config_network_layer_ble) {
265+
defines += [ "CFG_BLE_ENABLE" ]
266+
}
267+
263268
sources = [
264269
"${bl_iot_sdk_root}/components/platform/hosal/bl702_hal/bl_adc.c",
265270
"${bl_iot_sdk_root}/components/platform/hosal/bl702_hal/bl_boot2.c",
@@ -331,6 +336,12 @@ template("bl_iot_sdk") {
331336
":${sdk_target_name}_config_utils",
332337
":${sdk_target_name}_config_freertos",
333338
]
339+
340+
if (defined(invoker.chip_config_network_layer_ble) &&
341+
invoker.chip_config_network_layer_ble) {
342+
configs += [ ":${sdk_target_name}_config_ble" ]
343+
}
344+
334345
public_configs = [
335346
":${sdk_target_name}_config",
336347
":${sdk_target_name}_config_hosal",
@@ -752,6 +763,8 @@ template("bl_iot_sdk") {
752763
include_dirs = [
753764
"${bl_iot_sdk_root}/components/platform/soc/bl702/bl702_ethernet/Inc",
754765
]
766+
767+
cflags_cc = [ "-Wno-conversion" ]
755768
}
756769

757770
source_set("${sdk_target_name}_ethernet") {
@@ -813,7 +826,6 @@ template("bl_iot_sdk") {
813826
public_configs = [
814827
":${sdk_target_name}_config",
815828
":${sdk_target_name}_config_wifi",
816-
":${sdk_target_name}_config_lwip",
817829
]
818830

819831
cflags = [

third_party/bouffalolab/bl702l/bl_iot_sdk.gni

+16-1
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,11 @@ template("bl_iot_sdk") {
188188
}
189189

190190
source_set("${sdk_target_name}_hosal") {
191+
if (defined(invoker.chip_config_network_layer_ble) &&
192+
invoker.chip_config_network_layer_ble) {
193+
defines = [ "CFG_BLE_ENABLE" ]
194+
}
195+
191196
sources = [
192197
"${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/bl_adc.c",
193198
"${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/bl_boot2.c",
@@ -258,6 +263,11 @@ template("bl_iot_sdk") {
258263
":${sdk_target_name}_config_fs",
259264
":${sdk_target_name}_config_utils",
260265
]
266+
if (defined(invoker.chip_config_network_layer_ble) &&
267+
invoker.chip_config_network_layer_ble) {
268+
configs += [ ":${sdk_target_name}_config_ble" ]
269+
}
270+
261271
public_configs = [
262272
":${sdk_target_name}_config",
263273
":${sdk_target_name}_config_hosal",
@@ -688,7 +698,6 @@ template("bl_iot_sdk") {
688698
group(sdk_target_name) {
689699
public_deps = [
690700
":${sdk_target_name}_bl702l_rom_a0",
691-
":${sdk_target_name}_ble",
692701
":${sdk_target_name}_fs",
693702
":${sdk_target_name}_hosal",
694703
":${sdk_target_name}_libc",
@@ -699,6 +708,12 @@ template("bl_iot_sdk") {
699708
":${sdk_target_name}_utils",
700709
]
701710
public_configs = [ ":${sdk_target_name}_config_BSP_Driver" ]
711+
712+
if (defined(invoker.chip_config_network_layer_ble) &&
713+
invoker.chip_config_network_layer_ble) {
714+
public_deps += [ ":${sdk_target_name}_ble" ]
715+
}
716+
702717
if (defined(invoker.chip_enable_openthread) &&
703718
invoker.chip_enable_openthread) {
704719
public_deps += [ ":${sdk_target_name}_openthread_port" ]

0 commit comments

Comments
 (0)