Skip to content

Commit c2014ad

Browse files
authored
Merge pull request #350 from pennam/en-rodata
variants: avoid llext ro data relocation
2 parents cae7a3e + 62274b8 commit c2014ad

File tree

9 files changed

+3
-8
lines changed

9 files changed

+3
-8
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ Contributions are always welcome. The preferred way to receive code contribution
330330
## 📌 Upcoming features
331331
332332
- [ ] USB: switch to `USB_DEVICE_STACK_NEXT` to support PluggableUSB
333-
- [ ] Relocate RODATA in flash to accommodate sketches with large assets
333+
- [x] Relocate RODATA in flash to accommodate sketches with large assets
334334
- [ ] Provide better error reporting for failed llext operations
335335
- [ ] Replace [`llext_exports.c`](/loader/llext_exports.c) with proper symbols generation (via includes)
336336
- [ ] Fix corner cases with `std::` includes (like `<iterator>`)

loader/prj.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ CONFIG_LOG_MODE_IMMEDIATE=y
1010

1111
CONFIG_HEAP_MEM_POOL_SIZE=32768
1212
CONFIG_MAIN_STACK_SIZE=32768
13+
CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=-1
1314

1415
CONFIG_ARDUINO_API=y
1516

@@ -18,6 +19,7 @@ CONFIG_LLEXT_LOG_LEVEL_ERR=y
1819
CONFIG_LLEXT_HEAP_SIZE=32
1920
CONFIG_LLEXT_STORAGE_WRITABLE=y
2021
CONFIG_LLEXT_EXPORT_DEVICES=y
22+
CONFIG_LLEXT_RODATA_NO_RELOC=y
2123

2224
CONFIG_LLEXT_EDK=y
2325
CONFIG_LLEXT_EDK_FORMAT_TAR_ZSTD=y

variants/arduino_giga_r1_stm32h747xx_m7/arduino_giga_r1_stm32h747xx_m7.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ CONFIG_SHARED_MULTI_HEAP=y
1818
CONFIG_HEAP_MEM_POOL_SIZE=32768
1919
CONFIG_MAIN_STACK_SIZE=32768
2020
CONFIG_LLEXT_HEAP_SIZE=128
21-
CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=-1
2221

2322
CONFIG_CODE_DATA_RELOCATION=y
2423
CONFIG_MAIN_STACK_REGION="DTCM"

variants/arduino_nano_33_ble_nrf52840_sense/arduino_nano_33_ble_nrf52840_sense.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ CONFIG_LLEXT_STORAGE_WRITABLE=n
3737
CONFIG_HEAP_MEM_POOL_SIZE=16384
3838
CONFIG_LLEXT_HEAP_SIZE=128
3939
CONFIG_MAIN_STACK_SIZE=16384
40-
CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=-1
4140

4241
CONFIG_FPU=y
4342

variants/arduino_nano_matter_mgm240sd22vna/arduino_nano_matter_mgm240sd22vna.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ CONFIG_MAIN_STACK_SIZE=16000
55
CONFIG_HEAP_MEM_POOL_SIZE=112000
66
CONFIG_LLEXT_HEAP_SIZE=64
77
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
8-
CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=-1
98

109
CONFIG_FPU=y
1110
CONFIG_I2C=y

variants/arduino_nicla_sense_me_nrf52832/arduino_nicla_sense_me_nrf52832.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,3 @@ CONFIG_LLEXT_STORAGE_WRITABLE=n
2828
CONFIG_HEAP_MEM_POOL_SIZE=8192
2929
CONFIG_LLEXT_HEAP_SIZE=15
3030
CONFIG_MAIN_STACK_SIZE=2048
31-
CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=-1

variants/arduino_opta_stm32h747xx_m7/arduino_opta_stm32h747xx_m7.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ CONFIG_LLEXT_STORAGE_WRITABLE=n
1717
CONFIG_HEAP_MEM_POOL_SIZE=32768
1818
CONFIG_MAIN_STACK_SIZE=32768
1919
CONFIG_LLEXT_HEAP_SIZE=128
20-
CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=-1
2120

2221
CONFIG_CODE_DATA_RELOCATION=y
2322
CONFIG_MAIN_STACK_REGION="DTCM"

variants/arduino_portenta_h7_stm32h747xx_m7/arduino_portenta_h7_stm32h747xx_m7.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ CONFIG_CDC_ACM_DTE_RATE_CALLBACK_SUPPORT=y
1616
CONFIG_LLEXT_STORAGE_WRITABLE=n
1717
CONFIG_SHARED_MULTI_HEAP=y
1818
CONFIG_HEAP_MEM_POOL_SIZE=32768
19-
CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=-1
2019

2120
CONFIG_LOG_BACKEND_UART=y
2221
CONFIG_LOG_BACKEND_UART_AUTOSTART=n

variants/arduino_uno_q_stm32u585xx/arduino_uno_q_stm32u585xx.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
CONFIG_LLEXT_STORAGE_WRITABLE=n
55
CONFIG_HEAP_MEM_POOL_SIZE=32768
66
CONFIG_LLEXT_HEAP_SIZE=128
7-
CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=-1
87

98
CONFIG_FPU=y
109

0 commit comments

Comments
 (0)