Skip to content

Commit 4a0b5ce

Browse files
Felipe Nevescfriedt
authored andcommitted
soc: riscv: esp32c3: fix ble controller init
By appending the right link layer controller configurarion Signed-off-by: Felipe Neves <[email protected]>
1 parent 2a5c378 commit 4a0b5ce

File tree

6 files changed

+8
-27
lines changed

6 files changed

+8
-27
lines changed

boards/riscv/esp32c3_devkitm/Kconfig.defconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ if BT
1212
config HEAP_MEM_POOL_SIZE
1313
default 16384
1414

15-
config ENTROPY_GENERATOR
16-
default y
17-
1815
choice BT_HCI_BUS_TYPE
1916
default BT_ESP32
2017
endchoice

boards/riscv/esp32c3_devkitm/esp32c3_devkitm_defconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,3 @@ CONFIG_SERIAL=y
1010
CONFIG_UART_CONSOLE=y
1111
CONFIG_UART_ROM_ESP32C3=y
1212
CONFIG_XIP=n
13-
CONFIG_HEAP_MEM_POOL_SIZE=16384
14-
CONFIG_BT=y
15-

soc/riscv/esp32c3/Kconfig.soc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ config SOC_ESP32C3
55
bool "ESP32C3"
66
select RISCV
77
select RISCV_SOC_INIT_GP_VALUE
8+
select DYNAMIC_INTERRUPTS
89

910
config IDF_TARGET_ESP32C3
1011
bool "ESP32C3 as target board"

soc/riscv/esp32c3/linker.ld

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -150,15 +150,6 @@ SECTIONS
150150
.dram0.data :
151151
{
152152
_data_start = ABSOLUTE(.);
153-
_bt_data_start = ABSOLUTE(.);
154-
*libbt.a:(.data .data.*)
155-
. = ALIGN (4);
156-
_bt_data_end = ABSOLUTE(.);
157-
_btdm_data_start = ABSOLUTE(.);
158-
*libbtdm_app.a:(.data .data.*)
159-
. = ALIGN (4);
160-
_btdm_data_end = ABSOLUTE(.);
161-
162153
*(.data)
163154
*(.data.*)
164155
*(.gnu.linkonce.d.*)
@@ -197,16 +188,6 @@ SECTIONS
197188
{
198189
. = ALIGN (8);
199190
__bss_start = ABSOLUTE(.);
200-
201-
_bt_bss_start = ABSOLUTE(.);
202-
*libbt.a:(.bss .bss.* COMMON)
203-
. = ALIGN (4);
204-
_bt_bss_end = ABSOLUTE(.);
205-
_btdm_bss_start = ABSOLUTE(.);
206-
*libbtdm_app.a:(.bss .bss.* COMMON)
207-
. = ALIGN (4);
208-
_btdm_bss_end = ABSOLUTE(.);
209-
210191
*(.dynsbss)
211192
*(.sbss)
212193
*(.sbss.*)
@@ -231,7 +212,6 @@ SECTIONS
231212
*(.noinit)
232213
*(".noinit.*")
233214
. = ALIGN (8);
234-
_heap_start = ABSOLUTE(.);
235215
} GROUP_LINK_IN(RAMABLE_REGION)
236216

237217
.flash.text : ALIGN(4)

soc/riscv/esp32c3/soc.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,12 @@ void __attribute__((section(".iram1"))) __start(void)
9494
/* set global esp32c3's INTC masking level */
9595
esprv_intc_int_set_threshold(1);
9696

97+
/* Enable wireless phy subsystem clock,
98+
* This needs to be done before the kernel starts
99+
*/
100+
REG_CLR_BIT(SYSTEM_WIFI_CLK_EN_REG, SYSTEM_WIFI_CLK_SDIOSLAVE_EN);
101+
SET_PERI_REG_MASK(SYSTEM_WIFI_CLK_EN_REG, SYSTEM_WIFI_CLK_EN);
102+
97103
/* Start Zephyr */
98104
_PrepC();
99105

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ manifest:
6262
groups:
6363
- hal
6464
- name: hal_espressif
65-
revision: 7b19e8c4a66fa6fb05c5862175edb12e15659b72
65+
revision: 56a84e45eeaf3b6dea88b198c5c252c06f8ac774
6666
path: modules/hal/espressif
6767
groups:
6868
- hal

0 commit comments

Comments
 (0)