Skip to content

esp32: hal update and bugfixes #35248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 14, 2021
Merged

esp32: hal update and bugfixes #35248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cadce9c
linker: esp32: fix empty iterable symbols
sylvioalves May 11, 2021
757e0e7
west.yml: esp32: bugfixes and improvements
sylvioalves May 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 0 additions & 39 deletions soc/xtensa/esp32/linker.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,41 +265,6 @@ _net_buf_pool_list = _esp_net_buf_pool_list;
SECTION_PROLOGUE(_RODATA_SECTION_NAME,,ALIGN(20))
{
_rodata_start = ABSOLUTE(.);
#if defined(CONFIG_NET_SOCKETS)
. = ALIGN(4);
Z_LINK_ITERABLE(net_socket_register);
. = ALIGN(4);
#endif

#if defined(CONFIG_SETTINGS)
. = ALIGN(4);
Z_LINK_ITERABLE(settings_handler_static);
. = ALIGN(4);
#endif

#if defined(CONFIG_BT_BREDR)
. = ALIGN(4);
Z_LINK_ITERABLE(bt_l2cap_br_fixed_chan);
. = ALIGN(4);
#endif

#if defined(CONFIG_BT_MESH)
Z_LINK_ITERABLE(bt_mesh_subnet_cb);
Z_LINK_ITERABLE(bt_mesh_app_key_cb);
Z_LINK_ITERABLE(bt_mesh_hb_cb);
#endif

. = ALIGN(4);
Z_LINK_ITERABLE(bt_gatt_service_static);
. = ALIGN(4);

. = ALIGN(4);
Z_LINK_ITERABLE(bt_l2cap_fixed_chan);
. = ALIGN(4);

. = ALIGN(4);
Z_LINK_ITERABLE(shell);
. = ALIGN(4);

__esp_shell_root_cmds_start = .;
KEEP(*(SORT(.shell_root_cmd_*)));
Expand Down Expand Up @@ -337,10 +302,7 @@ _net_buf_pool_list = _esp_net_buf_pool_list;
_rodata_end = ABSOLUTE(.);
} GROUP_LINK_IN(ROMABLE_REGION)

#pragma push_macro("Z_ITERABLE_SECTION_ROM")
#pragma push_macro("ROMABLE_REGION")
#undef Z_ITERABLE_SECTION_ROM
#define Z_ITERABLE_SECTION_ROM(x,y)
#undef ROMABLE_REGION
/* This is to workaround limitation of `esptool` which needs single `FLASH` data segment
* which is already defined above. In case, `common-rom.ld` creates additional segments
Expand All @@ -355,7 +317,6 @@ __log_backends_end = __esp_log_backends_end;
__shell_root_cmds_start = __esp_shell_root_cmds_start;
__shell_root_cmds_end = __esp_shell_root_cmds_end;
#pragma pop_macro("ROMABLE_REGION")
#pragma pop_macro("Z_ITERABLE_SECTION_ROM")

SECTION_PROLOGUE(_TEXT_SECTION_NAME, , ALIGN(4))
{
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ manifest:
path: modules/lib/civetweb
- name: hal_espressif
west-commands: west/west-commands.yml
revision: 90952df320f30c696ea73a22a0e50f20b8f94fd3
revision: 086d305202390589a206523c239e604718759402
path: modules/hal/espressif
- name: fatfs
revision: 1d1fcc725aa1cb3c32f366e0c53d7490d0fe1109
Expand Down