Skip to content

Commit 363cfa8

Browse files
serhiiSalamakhas07641069
authored andcommitted
[Telink] Update set ble mac address for w91 and b9x
1 parent 5d836b9 commit 363cfa8

File tree

5 files changed

+10
-13
lines changed

5 files changed

+10
-13
lines changed

.github/workflows/chef.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
platform: telink
111111
- name: Update Zephyr to specific revision (for developers purpose)
112112
shell: bash
113-
run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 5ae5db00ac820fcbbcda9d7e71f0133240aa2c87"
113+
run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ab81a585fca6a83b30e1f4e58a021113d6a3acb8"
114114
- name: CI Examples Telink
115115
shell: bash
116116
run: |

.github/workflows/examples-telink.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
gh-context: ${{ toJson(github) }}
5858

5959
- name: Update Zephyr to specific revision (for developers purpose)
60-
run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 5ae5db00ac820fcbbcda9d7e71f0133240aa2c87"
60+
run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ab81a585fca6a83b30e1f4e58a021113d6a3acb8"
6161

6262
- name: Build example Telink (B92 retention) Air Quality Sensor App
6363
run: |

config/telink/chip-module/Kconfig.defaults

+4-2
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,12 @@ config BT_BUF_ACL_TX_SIZE
137137
default 251
138138

139139
config BT_RX_STACK_SIZE
140-
default 810
140+
default 810 if BT_B9X
141+
default 2048 if BT_W91
141142

142143
config BT_HCI_TX_STACK_SIZE
143-
default 640
144+
default 640 if BT_B9X
145+
default 2048 if BT_W91
144146

145147
config BT_DEVICE_NAME_GATT_WRITABLE
146148
bool

src/platform/telink/BLEManagerImpl.cpp

+2-8
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,9 @@
4545
#include <zephyr/sys/byteorder.h>
4646
#include <zephyr/sys/util.h>
4747

48-
// TODO: need common mac_init solution for B9X & W91
49-
#ifndef CONFIG_BOARD_TLSR9118BDK40D
5048
extern "C" {
51-
#include <b9x_bt_flash.h>
49+
extern __attribute__((noinline)) void telink_bt_blc_mac_init(uint8_t *bt_mac);
5250
}
53-
#endif
5451

5552
#if defined(CONFIG_PM) && !defined(CONFIG_CHIP_ENABLE_PM_DURING_BLE)
5653
#include <zephyr/pm/policy.h>
@@ -120,10 +117,7 @@ CHIP_ERROR InitBLEMACAddress()
120117
int error = 0;
121118
bt_addr_le_t addr;
122119

123-
// TODO: need common mac_init solution for B9X & W91
124-
#ifndef CONFIG_BOARD_TLSR9118BDK40D
125-
b9x_bt_blc_mac_init(addr.a.val);
126-
#endif
120+
telink_bt_blc_mac_init(addr.a.val);
127121

128122
if (BT_ADDR_IS_STATIC(&addr.a)) // in case of Random static address, create a new id
129123
{

src/platform/telink/tlsr9118bdk40d_3m_flash.overlay

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
/delete-node/ partition@88000;
88
/delete-node/ partition@f0000;
99
/delete-node/ partition@f4000;
10+
/delete-node/ partition@fe000;
1011
boot_partition: partition@0 {
1112
label = "mcuboot";
1213
reg = <0x00000000 0x20000>;
@@ -27,7 +28,7 @@
2728
label = "image-1";
2829
reg = <0x118000 0xe8000>;
2930
};
30-
reserved_partition: partition@200000 {
31+
vendor_partition: partition@200000 {
3132
label = "vendor-data";
3233
reg = <0x200000 0x100000>;
3334
};

0 commit comments

Comments
 (0)