This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 0c28094059a7a21ba1d7c3b25bd6a595d142ad08
Author: Petro Karashchenko <petro.karashche...@gmail.com>
AuthorDate: Mon Apr 24 14:47:49 2023 +0300
arch/xtensa/esp32: fix crash in BLE startup
ROM symbols provided by linker are placeholders for addresses
and not a pure addresses, so we need to read data pointed by
ROM symbols instead of using those as pure addresses.
Signed-off-by: Petro Karashchenko <petro.karashche...@gmail.com>
---
arch/xtensa/src/esp32/esp32_ble_adapter.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/xtensa/src/esp32/esp32_ble_adapter.c
b/arch/xtensa/src/esp32/esp32_ble_adapter.c
index e7afd20ff1..6ddb4952dd 100644
--- a/arch/xtensa/src/esp32/esp32_ble_adapter.c
+++ b/arch/xtensa/src/esp32/esp32_ble_adapter.c
@@ -451,8 +451,8 @@ extern uint8_t _bss_start_btdm[];
extern uint8_t _bss_end_btdm[];
extern uint8_t _data_start_btdm[];
extern uint8_t _data_end_btdm[];
-extern const uint8_t _data_start_btdm_rom[];
-extern const uint8_t _data_end_btdm_rom[];
+extern const uint32_t _data_start_btdm_rom;
+extern const uint32_t _data_end_btdm_rom;
extern uint8_t _bt_bss_start[];
extern uint8_t _bt_bss_end[];
@@ -2027,11 +2027,11 @@ static void btdm_controller_mem_init(void)
/* initialise .data section */
- memcpy(_data_start_btdm, _data_start_btdm_rom,
+ memcpy(_data_start_btdm, (void *)_data_start_btdm_rom,
_data_end_btdm - _data_start_btdm);
wlinfo(".data initialise [0x%08x] <== [0x%08x]\n",
- (uint32_t)_data_start_btdm, (uint32_t)_data_start_btdm_rom);
+ (uint32_t)_data_start_btdm, _data_start_btdm_rom);
/* initial em, .bss section */
