From 37e85cfe534f87981ee4821034a161f2ad123c9e Mon Sep 17 00:00:00 2001 From: wyhong Date: Thu, 14 Sep 2023 17:03:29 +0800 Subject: [PATCH 1/4] load ble tx power from flash configuration --- third_party/bouffalolab/bl602/bl_iot_sdk.gni | 2 ++ third_party/bouffalolab/bl702/bl_iot_sdk.gni | 14 +++++++++++++- third_party/bouffalolab/bl702l/bl_iot_sdk.gni | 16 +++++++++++++++- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/third_party/bouffalolab/bl602/bl_iot_sdk.gni b/third_party/bouffalolab/bl602/bl_iot_sdk.gni index be738a1820b508..49478261b84f3f 100644 --- a/third_party/bouffalolab/bl602/bl_iot_sdk.gni +++ b/third_party/bouffalolab/bl602/bl_iot_sdk.gni @@ -192,6 +192,7 @@ template("bl_iot_sdk") { } source_set("${sdk_target_name}_hosal") { + defines = [ "CFG_BLE_ENABLE" ] sources = [ "${bl_iot_sdk_root}/components/platform/hosal/bl602_hal/bl_adc.c", "${bl_iot_sdk_root}/components/platform/hosal/bl602_hal/bl_boot2.c", @@ -271,6 +272,7 @@ template("bl_iot_sdk") { ":${sdk_target_name}_config_fs", ":${sdk_target_name}_config_utils", ":${sdk_target_name}_config_freertos", + ":${sdk_target_name}_ble_config", ] public_configs = [ ":${sdk_target_name}_config", diff --git a/third_party/bouffalolab/bl702/bl_iot_sdk.gni b/third_party/bouffalolab/bl702/bl_iot_sdk.gni index d6b5ac30fff066..bb43a3af0ba8ff 100644 --- a/third_party/bouffalolab/bl702/bl_iot_sdk.gni +++ b/third_party/bouffalolab/bl702/bl_iot_sdk.gni @@ -236,6 +236,10 @@ template("bl_iot_sdk") { "DISABLE_PRINT=1", ] + if (defined(invoker.chip_config_network_layer_ble) && invoker.chip_config_network_layer_ble) { + defines += [ "CFG_BLE_ENABLE" ] + } + sources = [ "${bl_iot_sdk_root}/components/platform/hosal/bl702_hal/bl_adc.c", "${bl_iot_sdk_root}/components/platform/hosal/bl702_hal/bl_boot2.c", @@ -307,6 +311,11 @@ template("bl_iot_sdk") { ":${sdk_target_name}_config_utils", ":${sdk_target_name}_config_freertos", ] + + if (defined(invoker.chip_config_network_layer_ble) && invoker.chip_config_network_layer_ble) { + configs += [ ":${sdk_target_name}_ble_config" ] + } + public_configs = [ ":${sdk_target_name}_config", ":${sdk_target_name}_config_hosal", @@ -910,7 +919,6 @@ template("bl_iot_sdk") { public_deps = [ ":${sdk_target_name}_BSP_Driver", ":${sdk_target_name}_bl702_freertos", - ":${sdk_target_name}_ble", ":${sdk_target_name}_ethernet", ":${sdk_target_name}_fs", ":${sdk_target_name}_hosal", @@ -922,6 +930,10 @@ template("bl_iot_sdk") { ":${sdk_target_name}_utils", ] + if (defined(invoker.chip_config_network_layer_ble) && invoker.chip_config_network_layer_ble) { + public_deps += [ ":${sdk_target_name}_ble" ] + } + if (defined(invoker.chip_enable_wifi) && invoker.chip_enable_wifi) { public_deps += [ ":${sdk_target_name}_wifi" ] public_deps += [ ":${sdk_target_name}_lwip" ] diff --git a/third_party/bouffalolab/bl702l/bl_iot_sdk.gni b/third_party/bouffalolab/bl702l/bl_iot_sdk.gni index 89d35bc98bb1a5..35356c0a369f49 100644 --- a/third_party/bouffalolab/bl702l/bl_iot_sdk.gni +++ b/third_party/bouffalolab/bl702l/bl_iot_sdk.gni @@ -175,6 +175,11 @@ template("bl_iot_sdk") { } source_set("${sdk_target_name}_hosal") { + + if (defined(invoker.chip_config_network_layer_ble) && invoker.chip_config_network_layer_ble) { + defines = [ "CFG_BLE_ENABLE" ] + } + sources = [ "${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/bl_adc.c", "${bl_iot_sdk_root}/components/platform/hosal/bl702l_hal/bl_boot2.c", @@ -244,7 +249,12 @@ template("bl_iot_sdk") { ":${sdk_target_name}_config_sys", ":${sdk_target_name}_config_fs", ":${sdk_target_name}_config_utils", + ":${sdk_target_name}_ble_config", ] + if (defined(invoker.chip_config_network_layer_ble) && invoker.chip_config_network_layer_ble) { + configs += [ ":${sdk_target_name}_ble_config" ] + } + public_configs = [ ":${sdk_target_name}_config", ":${sdk_target_name}_config_hosal", @@ -676,7 +686,6 @@ template("bl_iot_sdk") { group(sdk_target_name) { public_deps = [ ":${sdk_target_name}_bl702l_rom_a0", - ":${sdk_target_name}_ble", ":${sdk_target_name}_fs", ":${sdk_target_name}_hosal", ":${sdk_target_name}_libc", @@ -686,6 +695,11 @@ template("bl_iot_sdk") { ":${sdk_target_name}_sys", ":${sdk_target_name}_utils", ] + + if (defined(invoker.chip_config_network_layer_ble) && invoker.chip_config_network_layer_ble) { + public_deps += [ ":${sdk_target_name}_ble" ] + } + public_configs = [ ":${sdk_target_name}_config_BSP_Driver" ] if (defined(invoker.chip_enable_openthread) && invoker.chip_enable_openthread) { From 1de776eece4042aed8173e11f8014f3c04b752c6 Mon Sep 17 00:00:00 2001 From: wyhong Date: Thu, 14 Sep 2023 23:15:43 +0800 Subject: [PATCH 2/4] change config name --- third_party/bouffalolab/bl602/bl_iot_sdk.gni | 2 +- third_party/bouffalolab/bl702/bl_iot_sdk.gni | 9 ++++----- third_party/bouffalolab/bl702l/bl_iot_sdk.gni | 5 ++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/third_party/bouffalolab/bl602/bl_iot_sdk.gni b/third_party/bouffalolab/bl602/bl_iot_sdk.gni index ebe7d7649e7ffd..80801c984036ff 100644 --- a/third_party/bouffalolab/bl602/bl_iot_sdk.gni +++ b/third_party/bouffalolab/bl602/bl_iot_sdk.gni @@ -283,7 +283,7 @@ template("bl_iot_sdk") { ":${sdk_target_name}_config_fs", ":${sdk_target_name}_config_utils", ":${sdk_target_name}_config_freertos", - ":${sdk_target_name}_ble_config", + ":${sdk_target_name}_config_ble", ] public_configs = [ ":${sdk_target_name}_config", diff --git a/third_party/bouffalolab/bl702/bl_iot_sdk.gni b/third_party/bouffalolab/bl702/bl_iot_sdk.gni index 2a3a1d01ad0248..5182f2e235f7e0 100644 --- a/third_party/bouffalolab/bl702/bl_iot_sdk.gni +++ b/third_party/bouffalolab/bl702/bl_iot_sdk.gni @@ -337,7 +337,7 @@ template("bl_iot_sdk") { ] if (defined(invoker.chip_config_network_layer_ble) && invoker.chip_config_network_layer_ble) { - configs += [ ":${sdk_target_name}_ble_config" ] + configs += [ ":${sdk_target_name}_config_ble" ] } public_configs = [ @@ -822,7 +822,6 @@ template("bl_iot_sdk") { public_configs = [ ":${sdk_target_name}_config", ":${sdk_target_name}_config_wifi", - ":${sdk_target_name}_config_lwip", ] cflags = [ @@ -963,12 +962,12 @@ template("bl_iot_sdk") { if (defined(invoker.chip_enable_wifi) && invoker.chip_enable_wifi) { public_deps += [ ":${sdk_target_name}_wifi" ] public_deps += [ ":${sdk_target_name}_lwip" ] + } else if (defined(invoker.chip_enable_ethernet) && invoker.chip_enable_ethernet) { + public_deps += [ ":${sdk_target_name}_ethernet" ] + public_deps += [ ":${sdk_target_name}_lwip" ] } else if (defined(invoker.chip_enable_openthread) && invoker.chip_enable_openthread) { public_deps += [ ":${sdk_target_name}_openthread_port" ] - } else { - public_deps += [ ":${sdk_target_name}_ethernet" ] - public_deps += [ ":${sdk_target_name}_lwip" ] } if (defined(invoker.enable_cdc_module) && invoker.enable_cdc_module) { diff --git a/third_party/bouffalolab/bl702l/bl_iot_sdk.gni b/third_party/bouffalolab/bl702l/bl_iot_sdk.gni index 27d8099add031c..13c299e9401480 100644 --- a/third_party/bouffalolab/bl702l/bl_iot_sdk.gni +++ b/third_party/bouffalolab/bl702l/bl_iot_sdk.gni @@ -262,10 +262,9 @@ template("bl_iot_sdk") { ":${sdk_target_name}_config_sys", ":${sdk_target_name}_config_fs", ":${sdk_target_name}_config_utils", - ":${sdk_target_name}_ble_config", ] if (defined(invoker.chip_config_network_layer_ble) && invoker.chip_config_network_layer_ble) { - configs += [ ":${sdk_target_name}_ble_config" ] + configs += [ ":${sdk_target_name}_config_ble" ] } public_configs = [ @@ -706,13 +705,13 @@ template("bl_iot_sdk") { ":${sdk_target_name}_stage", ":${sdk_target_name}_sys", ":${sdk_target_name}_utils", + "":${sdk_target_name}_config_BSP_Driver"" ] if (defined(invoker.chip_config_network_layer_ble) && invoker.chip_config_network_layer_ble) { public_deps += [ ":${sdk_target_name}_ble" ] } - public_configs = [ ":${sdk_target_name}_config_BSP_Driver" ] if (defined(invoker.chip_enable_openthread) && invoker.chip_enable_openthread) { public_deps += [ ":${sdk_target_name}_openthread_port" ] From a71646e736df0ef1c27d7585b5fe3e33c187b9e6 Mon Sep 17 00:00:00 2001 From: wyhong Date: Fri, 15 Sep 2023 00:18:02 +0800 Subject: [PATCH 3/4] fix compile error --- third_party/bouffalolab/bl702/bl_iot_sdk.gni | 14 +++++++------- third_party/bouffalolab/bl702l/bl_iot_sdk.gni | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/third_party/bouffalolab/bl702/bl_iot_sdk.gni b/third_party/bouffalolab/bl702/bl_iot_sdk.gni index 5182f2e235f7e0..932ebd5359b48b 100644 --- a/third_party/bouffalolab/bl702/bl_iot_sdk.gni +++ b/third_party/bouffalolab/bl702/bl_iot_sdk.gni @@ -629,6 +629,7 @@ template("bl_iot_sdk") { ] cflags_cc = [ "-Wno-conversion" ] + } source_set("${sdk_target_name}_ble") { @@ -761,6 +762,8 @@ template("bl_iot_sdk") { include_dirs = [ "${bl_iot_sdk_root}/components/platform/soc/bl702/bl702_ethernet/Inc", ] + + cflags_cc = [ "-Wno-conversion" ] } source_set("${sdk_target_name}_ethernet") { @@ -945,6 +948,7 @@ template("bl_iot_sdk") { public_deps = [ ":${sdk_target_name}_BSP_Driver", ":${sdk_target_name}_bl702_freertos", + ":${sdk_target_name}_ble", ":${sdk_target_name}_fs", ":${sdk_target_name}_hosal", ":${sdk_target_name}_libc", @@ -955,19 +959,15 @@ template("bl_iot_sdk") { ":${sdk_target_name}_utils", ] - if (defined(invoker.chip_config_network_layer_ble) && invoker.chip_config_network_layer_ble) { - public_deps += [ ":${sdk_target_name}_ble" ] - } - if (defined(invoker.chip_enable_wifi) && invoker.chip_enable_wifi) { public_deps += [ ":${sdk_target_name}_wifi" ] public_deps += [ ":${sdk_target_name}_lwip" ] - } else if (defined(invoker.chip_enable_ethernet) && invoker.chip_enable_ethernet) { - public_deps += [ ":${sdk_target_name}_ethernet" ] - public_deps += [ ":${sdk_target_name}_lwip" ] } else if (defined(invoker.chip_enable_openthread) && invoker.chip_enable_openthread) { public_deps += [ ":${sdk_target_name}_openthread_port" ] + } else { + public_deps += [ ":${sdk_target_name}_ethernet" ] + public_deps += [ ":${sdk_target_name}_lwip" ] } if (defined(invoker.enable_cdc_module) && invoker.enable_cdc_module) { diff --git a/third_party/bouffalolab/bl702l/bl_iot_sdk.gni b/third_party/bouffalolab/bl702l/bl_iot_sdk.gni index 13c299e9401480..50860f2877f5f0 100644 --- a/third_party/bouffalolab/bl702l/bl_iot_sdk.gni +++ b/third_party/bouffalolab/bl702l/bl_iot_sdk.gni @@ -705,9 +705,9 @@ template("bl_iot_sdk") { ":${sdk_target_name}_stage", ":${sdk_target_name}_sys", ":${sdk_target_name}_utils", - "":${sdk_target_name}_config_BSP_Driver"" ] - + public_configs = [ ":${sdk_target_name}_config_BSP_Driver" ] + if (defined(invoker.chip_config_network_layer_ble) && invoker.chip_config_network_layer_ble) { public_deps += [ ":${sdk_target_name}_ble" ] } From f03c76f1d869f51b2869471358e15c388113afd6 Mon Sep 17 00:00:00 2001 From: wyhong Date: Fri, 15 Sep 2023 10:18:11 +0800 Subject: [PATCH 4/4] fix restyle --- third_party/bouffalolab/bl702/bl_iot_sdk.gni | 7 ++++--- third_party/bouffalolab/bl702l/bl_iot_sdk.gni | 12 +++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/third_party/bouffalolab/bl702/bl_iot_sdk.gni b/third_party/bouffalolab/bl702/bl_iot_sdk.gni index 932ebd5359b48b..a4e19a9db15813 100644 --- a/third_party/bouffalolab/bl702/bl_iot_sdk.gni +++ b/third_party/bouffalolab/bl702/bl_iot_sdk.gni @@ -260,7 +260,8 @@ template("bl_iot_sdk") { "DISABLE_PRINT=1", ] - if (defined(invoker.chip_config_network_layer_ble) && invoker.chip_config_network_layer_ble) { + if (defined(invoker.chip_config_network_layer_ble) && + invoker.chip_config_network_layer_ble) { defines += [ "CFG_BLE_ENABLE" ] } @@ -336,7 +337,8 @@ template("bl_iot_sdk") { ":${sdk_target_name}_config_freertos", ] - if (defined(invoker.chip_config_network_layer_ble) && invoker.chip_config_network_layer_ble) { + if (defined(invoker.chip_config_network_layer_ble) && + invoker.chip_config_network_layer_ble) { configs += [ ":${sdk_target_name}_config_ble" ] } @@ -629,7 +631,6 @@ template("bl_iot_sdk") { ] cflags_cc = [ "-Wno-conversion" ] - } source_set("${sdk_target_name}_ble") { diff --git a/third_party/bouffalolab/bl702l/bl_iot_sdk.gni b/third_party/bouffalolab/bl702l/bl_iot_sdk.gni index 50860f2877f5f0..c84a3b2cb8d8af 100644 --- a/third_party/bouffalolab/bl702l/bl_iot_sdk.gni +++ b/third_party/bouffalolab/bl702l/bl_iot_sdk.gni @@ -188,8 +188,8 @@ template("bl_iot_sdk") { } source_set("${sdk_target_name}_hosal") { - - if (defined(invoker.chip_config_network_layer_ble) && invoker.chip_config_network_layer_ble) { + if (defined(invoker.chip_config_network_layer_ble) && + invoker.chip_config_network_layer_ble) { defines = [ "CFG_BLE_ENABLE" ] } @@ -263,7 +263,8 @@ template("bl_iot_sdk") { ":${sdk_target_name}_config_fs", ":${sdk_target_name}_config_utils", ] - if (defined(invoker.chip_config_network_layer_ble) && invoker.chip_config_network_layer_ble) { + if (defined(invoker.chip_config_network_layer_ble) && + invoker.chip_config_network_layer_ble) { configs += [ ":${sdk_target_name}_config_ble" ] } @@ -707,8 +708,9 @@ template("bl_iot_sdk") { ":${sdk_target_name}_utils", ] public_configs = [ ":${sdk_target_name}_config_BSP_Driver" ] - - if (defined(invoker.chip_config_network_layer_ble) && invoker.chip_config_network_layer_ble) { + + if (defined(invoker.chip_config_network_layer_ble) && + invoker.chip_config_network_layer_ble) { public_deps += [ ":${sdk_target_name}_ble" ] }