kheap_llext: rename kheap_llext_heap symbol

rename kheap_llext_heap and kheap_llext_heap_size symbols to
kheap__sketch_heap

Signed-off-by: Andrea Gilardoni <a.gilardoni@arduino.cc>

Author: andreagilardoni

cores/arduino/main.cpp

@@ -89,14 +89,14 @@ extern "C" __attribute__((section(".entry_point"), used)) void entry_point(struc
 	extern uintptr_t _ebss;
 	extern uintptr_t __heap_start;
 	extern uintptr_t __heap_end;
-	extern uintptr_t kheap_llext_heap;
-	extern uintptr_t kheap_llext_heap_size;
+	extern uintptr_t kheap__sketch_heap;
+	extern uintptr_t kheap__sketch_heap_size;
 
 	//__asm volatile ("cpsie i");
 
 	printk("System Heap end: %p\n", &__heap_end);
 	printk("System Heap start: %p\n", &__heap_start);
-	printk("Sketch Heap start: %p, size %p\n", &kheap_llext_heap, &kheap_llext_heap_size);
+	printk("Sketch Heap start: %p, size %p\n", &kheap__sketch_heap, &kheap__sketch_heap_size);
 
 	memcpy(&_sdata, &_sidata, (&_edata - &_sdata) * sizeof(uint32_t));
 	memset(&_sbss, 0, (&_ebss - &_sbss) * sizeof(uint32_t));

extra/build.sh

@@ -99,13 +99,17 @@ cp ${BUILD_DIR}/zephyr/.config firmwares/zephyr-$variant.config
 
 # Generate the provides.ld file for linked builds
 echo "Generating exported symbol scripts for dynamic builds"
-extra/gen_provides.py "${BUILD_DIR}/zephyr/zephyr.elf" -L > ${VARIANT_DIR}/syms-dynamic.ld
+extra/gen_provides.py "${BUILD_DIR}/zephyr/zephyr.elf" -L \
+	"kheap_llext_heap=kheap__sketch_heap" \
+	"kheap_llext_heap_size=kheap__sketch_heap_size" > ${VARIANT_DIR}/syms-dynamic.ld
 
 echo "Generating exported symbol scripts for static builds"
 extra/gen_provides.py "${BUILD_DIR}/zephyr/zephyr.elf" -LF \
 	-R '__device_dts_ord_\d+' \
-	"+kheap_llext_heap" \
+	"+kheap__sketch_heap" \
 	"+kheap__system_heap" \
+	"kheap_llext_heap=kheap__sketch_heap" \
+	"kheap_llext_heap_size=kheap__sketch_heap_size" \
 	"*sketch_base_addr=_sketch_start" \
 	"*sketch_max_size=_sketch_max_size" \
 	"*loader_max_size=_loader_max_size" \

variants/_ldscripts/memory-check.ld

@@ -9,5 +9,5 @@ PROVIDE(__heap_end = 0x50000000);
 PROVIDE(kheap__system_heap = 0x40000000);
 PROVIDE(kheap__system_heap_size = 0x10000000);
 
-PROVIDE(kheap_llext_heap = 0x60000000);
-PROVIDE(kheap_llext_heap_size = 0x10000000);
+PROVIDE(kheap__sketch_heap = 0x60000000);
+PROVIDE(kheap__sketch_heap_size = 0x10000000);

variants/_ldscripts/memory-static.ld

@@ -2,7 +2,7 @@ MEMORY
 {
     /* 16 below compensates for the zsk header that is added before the .bin */
     FLASH (rx) : ORIGIN = _sketch_start + 16, LENGTH = _sketch_max_size - 16
-    RAM (rwx) : ORIGIN = kheap_llext_heap, LENGTH = kheap_llext_heap_size
+    RAM (rwx) : ORIGIN = kheap__sketch_heap, LENGTH = kheap__sketch_heap_size
 }
 
 PROVIDE(__heap_start = kheap__system_heap);