Ocre containers: Adding support for NRF5340-DK board

WIP: Using nordic NRF5340DK board for testing and leveraging Ocre
containers.

Currently adding minimal support to make it compile and run on the
actual hardware. Will continue adding configs across with the
functionalities

Signed-off-by: Federico Roux <rouxfederico@gmail.com>

Author: fgr-17

CMakeLists.txt

@@ -8,7 +8,7 @@ endif()
 if(TARGET_PLATFORM_NAME STREQUAL "Linux")
     project(ocre LANGUAGES C ASM)
 elseif(TARGET_PLATFORM_NAME STREQUAL "Zephyr")
-    find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})  
+    find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
     project(ocre VERSION ${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_PATCHLEVEL}.${APP_VERSION_TWEAK} LANGUAGES C ASM)
 else()
     message(FATAL_ERROR "Unsupported TARGET_PLATFORM_NAME: ${TARGET_PLATFORM_NAME}")
@@ -57,15 +57,15 @@ add_custom_target(generate_messages DEPENDS ${MSG_GENERATED_FILE})
 
 if(NOT "${OCRE_INPUT_FILE}" STREQUAL "")
     message("Using input file: ${OCRE_INPUT_FILE}")
-    
+
     # Extract filename without extension for use in software
     get_filename_component(OCRE_INPUT_FILE_NAME ${OCRE_INPUT_FILE} NAME_WE)
     message("Input file name (without extension): ${OCRE_INPUT_FILE_NAME}")
     add_definitions(-DOCRE_INPUT_FILE_NAME="${OCRE_INPUT_FILE_NAME}")
-    
+
     add_custom_command(
         OUTPUT ${CMAKE_CURRENT_LIST_DIR}/src/ocre/ocre_input_file.g
-        COMMAND xxd -n wasm_binary -i ${OCRE_INPUT_FILE} | sed 's/^unsigned/static const unsigned/' > ${OCRE_ROOT_DIR}/src/ocre/ocre_input_file.g
+        COMMAND xxd -i ${OCRE_INPUT_FILE} | sed 's/unsigned char .*\\[/static unsigned char wasm_binary[/' | sed 's/unsigned int .*_len/static unsigned int wasm_binary_len/' > ${CMAKE_CURRENT_LIST_DIR}/src/ocre/ocre_input_file.g
         DEPENDS ${OCRE_INPUT_FILE}
         COMMENT "Generating C header from ${OCRE_INPUT_FILE}"
     )

boards/nrf5340dk_nrf5340_cpuapp.conf

@@ -0,0 +1,79 @@
+CONFIG_ARM_MPU=y
+CONFIG_MAIN_STACK_SIZE=4096
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=-1
+CONFIG_HEAP_MEM_POOL_SIZE=32768
+
+# Container defaults - Reduced for nRF5340's limited RAM
+CONFIG_MAX_CONTAINERS=2
+CONFIG_OCRE_WAMR_HEAP_BUFFER_SIZE=180000
+CONFIG_OCRE_CONTAINER_DEFAULT_HEAP_SIZE=4096
+CONFIG_OCRE_CONTAINER_DEFAULT_STACK_SIZE=4096
+
+# DISABLE OCRE SHELL (this is what's causing the shell_fprintf errors!)
+CONFIG_OCRE_SHELL=n
+
+# Disable the main Zephyr shell AND all shell subsystems
+CONFIG_NET_SHELL=n
+CONFIG_FILE_SYSTEM_SHELL=n
+CONFIG_SENSOR_SHELL=n
+
+# Override shell-related configs from prj.conf since shell is disabled
+
+# Random number generator (REQUIRED by networking and RNG sensor)
+CONFIG_ENTROPY_GENERATOR=y
+CONFIG_TEST_RANDOM_GENERATOR=y
+
+# Reduce networking stack sizes to save RAM
+CONFIG_NET_TX_STACK_SIZE=1024
+CONFIG_NET_RX_STACK_SIZE=2048
+CONFIG_NET_BUF_TX_COUNT=8
+CONFIG_NET_BUF_RX_COUNT=16
+CONFIG_NET_MGMT_EVENT_STACK_SIZE=1024
+CONFIG_NET_PKT_RX_COUNT=8
+CONFIG_NET_PKT_TX_COUNT=8
+CONFIG_NET_BUF_DATA_SIZE=128
+
+# Bus interfaces
+CONFIG_GPIO=y
+
+# Ocre Sensors support
+CONFIG_SENSOR=y
+CONFIG_OCRE_SENSORS=y
+CONFIG_RNG_SENSOR=y
+
+# Ocre GPIO Support (minimal)
+CONFIG_OCRE_GPIO=y
+CONFIG_OCRE_GPIO_MAX_PORTS=4
+CONFIG_OCRE_GPIO_PINS_PER_PORT=8
+CONFIG_OCRE_GPIO_MAX_PINS=32
+
+# Disable container messaging to save RAM
+CONFIG_OCRE_CONTAINER_MESSAGING=y
+
+# Enable container filesystem for WASI stdio
+CONFIG_OCRE_CONTAINER_FILESYSTEM=y
+
+# CONFIG_BOOTLOADER_MCUBOOT=n
+# # CONFIG_IMG_MANAGER=n
+# CONFIG_MCUBOOT_IMG_MANAGER=n
+# CONFIG_STREAM_FLASH=n
+# CONFIG_IMG_ERASE_PROGRESSIVELY=n
+
+# Flash settings
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+CONFIG_FLASH_PAGE_LAYOUT=y
+
+# Serial/UART
+CONFIG_SERIAL=y
+CONFIG_UART_CONSOLE=y
+CONFIG_CONSOLE=y
+
+# Reduce other buffers
+CONFIG_ZVFS_OPEN_MAX=8
+CONFIG_ZVFS_EVENTFD_MAX=5
+
+CONFIG_LOG_TRACE_SHORT_TIMESTAMP=n
+
+CONFIG_SHELL_PROMPT_UART=""

boards/nrf5340dk_nrf5340_cpuapp.overlay

@@ -0,0 +1,34 @@
+/ {
+    aliases {
+        rng0 = &rng_device;
+        led0 = &led0;
+    };
+
+    rng_device: rng_0 {
+        compatible = "custom,rng-sensor";
+        label = "RNG Sensor";
+        status = "okay";
+    };
+
+    devices {
+        compatible = "custom,devices";
+        status = "okay";
+        device_list = <&rng_device>;
+    };
+};
+
+/* Enable one LED for blinky */
+&led0 {
+    status = "okay";
+};
+
+&flash0 {
+    partitions {
+        /delete-node/ partition@f8000;
+
+        user_data_partition: partition@e0000 {
+            label = "user_data";
+            reg = <0x000e0000 DT_SIZE_K(128)>;
+        };
+    };
+};

build.sh

@@ -91,6 +91,11 @@ if [[ "$TARGET" == "z" ]]; then
                         -DDTC_OVERLAY_FILE=boards/${ZEPHYR_BOARD}.overlay\;boards/enc28j60.overlay"
             echo "Building for b_u585i_iot02a with ENC28J60 support"
             ;;
+        5340)
+            ZEPHYR_BOARD="nrf5340dk/nrf5340/cpuapp"
+            CONF_EXTRA=""
+            echo "Building for nrf5340dk board: App CPU"
+            ;;
         *)
             ZEPHYR_BOARD="$BOARD_ARG"
             CONF_EXTRA=""

src/ocre/components/container_supervisor/cs_sm_impl.c

@@ -263,6 +263,9 @@ ocre_container_runtime_status_t CS_runtime_init(ocre_cs_ctx *ctx, ocre_container
 #ifdef CONFIG_OCRE_TIMER
     ocre_timer_init();
 #endif
+#ifdef CONFIG_OCRE_GPIO
+    ocre_gpio_init();
+#endif
 #ifdef CONFIG_OCRE_CONTAINER_MESSAGING
     ocre_messaging_init();
 #endif

src/ocre/ocre_gpio/ocre_gpio.c

@@ -104,6 +104,10 @@ int ocre_gpio_init(void) {
 #elif defined(CONFIG_BOARD_W5500_EVB_PICO2)
     INIT_GPIO_PORT_NAMED(0, DT_NODELABEL(gpio0), "GPIO0");
 
+#elif defined(CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP)
+    INIT_GPIO_PORT_NAMED(0, DT_NODELABEL(gpio0), "GPIO0");
+    INIT_GPIO_PORT_NAMED(1, DT_NODELABEL(gpio1), "GPIO1");
+
 #else
     // Generic fallback
 #if DT_NODE_EXISTS(DT_NODELABEL(gpio0))
@@ -384,7 +388,7 @@ static void gpio_callback_handler(const struct device *port, struct gpio_callbac
 }
 
 //========================================================================================================================================================================================================================================================================================================
-// By Name 
+// By Name
 //========================================================================================================================================================================================================================================================================================================
 static int find_port_index(const struct device *port) {
     if (!port) {
@@ -662,12 +666,12 @@ int ocre_gpio_wasm_register_callback_by_name(wasm_exec_env_t exec_env, const cha
 
     int global_pin = port_idx * CONFIG_OCRE_GPIO_PINS_PER_PORT + pin;
     LOG_INF("Registering callback by name: %s, global_pin=%d", name, global_pin);
-    
+
     if (global_pin >= CONFIG_OCRE_GPIO_MAX_PINS) {
         LOG_ERR("Global pin %d exceeds max %d", global_pin, CONFIG_OCRE_GPIO_MAX_PINS);
         return -EINVAL;
     }
-    
+
     return ocre_gpio_register_callback(global_pin);
 }
 
@@ -686,6 +690,6 @@ int ocre_gpio_wasm_unregister_callback_by_name(wasm_exec_env_t exec_env, const c
 
     int global_pin = port_idx * CONFIG_OCRE_GPIO_PINS_PER_PORT + pin;
     LOG_INF("Unregistering callback by name: %s, global_pin=%d", name, global_pin);
-    
+
     return ocre_gpio_unregister_callback(global_pin);
 }

src/samples-mini/zephyr/main.c

@@ -47,8 +47,22 @@ int main(int argc, char *argv[]) {
     ocre_container_runtime_status_t ret = ocre_container_runtime_init(&ctx, &args);
 
     if (ret == RUNTIME_STATUS_INITIALIZED) {
-        printf("\n\nOcre runtime started\n");
 
+        #ifndef CONFIG_SOC_SERIES
+        #define CONFIG_SOC_SERIES "undefined"
+        #endif
+
+        printf("\n\n");
+        printf("═══════════════════════════════════════════════════════\n");
+        printf("  Ocre Runtime v%s\n", APP_VERSION_STRING);
+        printf("═══════════════════════════════════════════════════════\n");
+        printf("  Zephyr:    %s\n", KERNEL_VERSION_STRING);
+        printf("  Board:     %s\n", CONFIG_BOARD_TARGET);
+        printf("  SoC:       %s (%s)\n", CONFIG_SOC, CONFIG_SOC_SERIES);
+        printf("  Arch:      %s\n", CONFIG_ARCH);
+        printf("  RAM:       %d KB heap\n", CONFIG_HEAP_MEM_POOL_SIZE / 1024);
+        printf("  WAMR:      %d KB\n", CONFIG_OCRE_WAMR_HEAP_BUFFER_SIZE / 1024);
+        printf("═══════════════════════════════════════════════════════\n\n");
         create_sample_container(container_filename);
 
         // Step 2:  Create the container, this allocates and loads the container binary
@@ -70,7 +84,10 @@ int main(int argc, char *argv[]) {
 
     } else {
         printf("\n\nOcre runtime failed to start.\n");
+        return 1;
     }
+
+    return 0;
 }
 
 /**

src/shared/platform/zephyr/ocre_internal.cmake

@@ -20,7 +20,7 @@ elseif (DEFINED CONFIG_XTENSA)
 elseif (DEFINED CONFIG_RISCV)
     set(TARGET_ISA RISCV32)
 elseif (DEFINED CONFIG_ARCH_POSIX)
-    set(TARGET_ISA X86_32)  
+    set(TARGET_ISA X86_32)
 else ()
     message(FATAL_ERROR "Unsupported ISA: ${CONFIG_ARCH}")
 endif ()
@@ -117,6 +117,11 @@ target_sources(app PRIVATE
     ${OCRE_ROOT_DIR}/src/samples-mini/zephyr/main.c
 )
 
+set_source_files_properties(
+    ${WAMR_RUNTIME_LIB_SOURCE}
+    PROPERTIES COMPILE_FLAGS "-w"
+)
+
 add_dependencies(app generate_messages)
 
 if(NOT "${OCRE_INPUT_FILE}" STREQUAL "")

wasm-micro-runtime

@@ -14,6 +14,7 @@ manifest:
           - hal_st
           - mbedtls
           - cmsis_6
-      
+          - hal_nordic
+
   self:
-    path: application   
+    path: application