update to zephyr 2.5

apps/microtvm/reference-vm/zephyr/base-box/setup.sh

@@ -81,17 +81,17 @@ pip3 install --user -U west
 echo 'export PATH=$HOME/.local/bin:"$PATH"' >> ~/.profile
 source ~/.profile
 echo PATH=$PATH
-west init --mr v2.4.0 ~/zephyr
+west init --mr v2.5.0 ~/zephyr
 cd ~/zephyr
 west update
 west zephyr-export
 
 cd ~
 echo "Downloading zephyr SDK..."
-wget --no-verbose https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.11.3/zephyr-sdk-0.11.3-setup.run
-chmod +x zephyr-sdk-0.11.3-setup.run
-./zephyr-sdk-0.11.3-setup.run -- -d ~/zephyr-sdk -y
-rm -rf zephyr-sdk-0.11.3-setup.run
+wget --no-verbose https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.12.3/zephyr-sdk-0.12.3-x86_64-linux-setup.run
+chmod +x zephyr-sdk-0.12.3-x86_64-linux-setup.run
+./zephyr-sdk-0.12.3-x86_64-linux-setup.run -- -d ~/zephyr-sdk -y
+rm -rf zephyr-sdk-0.12.3-x86_64-linux-setup.run
 
 # GDB for Zephyr SDK depends on python3.8
 sudo add-apt-repository ppa:deadsnakes/ppa

apps/microtvm/zephyr/demo_runtime/src/main.c

@@ -127,18 +127,18 @@ tvm_crt_error_t TVMPlatformGenerateRandom(uint8_t* buffer, size_t num_bytes) {
   return kTvmErrorNoError;
 }
 
-// Memory pool for use by TVMPlatformMemoryAllocate.
-K_MEM_POOL_DEFINE(tvm_memory_pool, 64, 1024, 216, 4);
+// Heap for use by TVMPlatformMemoryAllocate.
+K_HEAP_DEFINE(tvm_heap, 216 * 1024);
 
 // Called by TVM to allocate memory.
 tvm_crt_error_t TVMPlatformMemoryAllocate(size_t num_bytes, DLDevice dev, void** out_ptr) {
-  *out_ptr = k_mem_pool_malloc(&tvm_memory_pool, num_bytes);
+  *out_ptr = k_heap_aligned_alloc(&tvm_heap, sizeof(int), num_bytes, K_NO_WAIT);
   return (*out_ptr == NULL) ? kTvmErrorPlatformNoMemory : kTvmErrorNoError;
 }
 
 // Called by TVM to deallocate memory.
 tvm_crt_error_t TVMPlatformMemoryFree(void* ptr, DLDevice dev) {
-  k_free(ptr);
+  k_heap_free(&tvm_heap, ptr);
   return kTvmErrorNoError;
 }