michaelh/zephyr
1
0
Fork 0
Code Releases Activity

llext-edk: add Kconfig option to enable EDK generation

Browse source 
Add a new Kconfig option to make the generation of an Extension
Development Kit (EDK) for the LLEXT subsystem optional. This
allows to cleanly separate EDK-related configuration and build
steps from the rest of the Zeprhyr build system.

Signed-off-by: Luca Burelli <l.burelli@arduino.cc>
This commit is contained in:
Luca Burelli 2025-01-30 11:17:14 +01:00 • committed by Benjamin Cabé
commit d043a21426
2 changed files with 40 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

56
CMakeLists.txt
View file

@ -2220,46 +2220,48 @@ if((CMAKE_BUILD_TYPE IN_LIST build_types) AND (NOT NO_BUILD_TYPE_WARNING))
endif() endif()
# Extension Development Kit (EDK) generation. # Extension Development Kit (EDK) generation.
set(llext_edk_file ${PROJECT_BINARY_DIR}/${CONFIG_LLEXT_EDK_NAME}.tar.xz) if(CONFIG_LLEXT_EDK)
set(llext_edk_file ${PROJECT_BINARY_DIR}/${CONFIG_LLEXT_EDK_NAME}.tar.xz)
# TODO maybe generate flags for C CXX ASM # TODO maybe generate flags for C CXX ASM
zephyr_get_compile_definitions_for_lang(C zephyr_defs) zephyr_get_compile_definitions_for_lang(C zephyr_defs)
zephyr_get_compile_options_for_lang(C zephyr_flags) zephyr_get_compile_options_for_lang(C zephyr_flags)
# Filter out non LLEXT and LLEXT_EDK flags - and add required ones # Filter out non LLEXT and LLEXT_EDK flags - and add required ones
llext_filter_zephyr_flags(LLEXT_REMOVE_FLAGS ${zephyr_flags} llext_filt_flags) llext_filter_zephyr_flags(LLEXT_REMOVE_FLAGS ${zephyr_flags} llext_filt_flags)
llext_filter_zephyr_flags(LLEXT_EDK_REMOVE_FLAGS ${llext_filt_flags} llext_filt_flags) llext_filter_zephyr_flags(LLEXT_EDK_REMOVE_FLAGS ${llext_filt_flags} llext_filt_flags)
set(llext_edk_cflags ${zephyr_defs} -DLL_EXTENSION_BUILD) set(llext_edk_cflags ${zephyr_defs} -DLL_EXTENSION_BUILD)
list(APPEND llext_edk_cflags ${llext_filt_flags}) list(APPEND llext_edk_cflags ${llext_filt_flags})
list(APPEND llext_edk_cflags ${LLEXT_APPEND_FLAGS}) list(APPEND llext_edk_cflags ${LLEXT_APPEND_FLAGS})
list(APPEND llext_edk_cflags ${LLEXT_EDK_APPEND_FLAGS}) list(APPEND llext_edk_cflags ${LLEXT_EDK_APPEND_FLAGS})
build_info(llext-edk file PATH ${llext_edk_file}) build_info(llext-edk file PATH ${llext_edk_file})
build_info(llext-edk cflags VALUE ${llext_edk_cflags}) build_info(llext-edk cflags VALUE ${llext_edk_cflags})
build_info(llext-edk include-dirs VALUE "$<TARGET_PROPERTY:zephyr_interface,INTERFACE_INCLUDE_DIRECTORIES>") build_info(llext-edk include-dirs VALUE "$<TARGET_PROPERTY:zephyr_interface,INTERFACE_INCLUDE_DIRECTORIES>")
add_custom_command( add_custom_command(
OUTPUT ${llext_edk_file} OUTPUT ${llext_edk_file}
# Regenerate syscalls in case CONFIG_LLEXT_EDK_USERSPACE_ONLY # Regenerate syscalls in case CONFIG_LLEXT_EDK_USERSPACE_ONLY
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
-E make_directory edk/include/generated/zephyr -E make_directory edk/include/generated/zephyr
COMMAND COMMAND
${PYTHON_EXECUTABLE} ${PYTHON_EXECUTABLE}
${ZEPHYR_BASE}/scripts/build/gen_syscalls.py ${ZEPHYR_BASE}/scripts/build/gen_syscalls.py
--json-file ${syscalls_json} # Read this file --json-file ${syscalls_json} # Read this file
--base-output edk/include/generated/zephyr/syscalls # Write to this dir --base-output edk/include/generated/zephyr/syscalls # Write to this dir
--syscall-dispatch edk/include/generated/zephyr/syscall_dispatch.c # Write this file --syscall-dispatch edk/include/generated/zephyr/syscall_dispatch.c # Write this file
--syscall-list ${edk_syscall_list_h} --syscall-list ${edk_syscall_list_h}
$<$<BOOL:${CONFIG_LLEXT_EDK_USERSPACE_ONLY}>:--userspace-only> $<$<BOOL:${CONFIG_LLEXT_EDK_USERSPACE_ONLY}>:--userspace-only>
${SYSCALL_LONG_REGISTERS_ARG} ${SYSCALL_LONG_REGISTERS_ARG}
${SYSCALL_SPLIT_TIMEOUT_ARG} ${SYSCALL_SPLIT_TIMEOUT_ARG}
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
-P ${ZEPHYR_BASE}/cmake/llext-edk.cmake -P ${ZEPHYR_BASE}/cmake/llext-edk.cmake
DEPENDS ${logical_target_for_zephyr_elf} build_info_yaml_saved DEPENDS ${logical_target_for_zephyr_elf} build_info_yaml_saved
COMMAND_EXPAND_LISTS COMMAND_EXPAND_LISTS
) )
add_custom_target(llext-edk DEPENDS ${llext_edk_file}) add_custom_target(llext-edk DEPENDS ${llext_edk_file})
endif()
# @Intent: Set compiler specific flags for standard C/C++ includes # @Intent: Set compiler specific flags for standard C/C++ includes
# Done at the very end, so any other system includes which may # Done at the very end, so any other system includes which may

13
subsys/llext/Kconfig
View file

@ -126,7 +126,16 @@ source "subsys/logging/Kconfig.template.log_config"
endif endif
menu "Linkable loadable Extension Development Kit (EDK)" menuconfig LLEXT_EDK
bool "Linkable loadable Extension Development Kit (EDK)"
default y if LLEXT
help
Enable the generation of an Extension Development Kit (EDK) for the
Linkable Loadable Extension subsystem. The EDK is an archive that
contains the necessary files and build settings to build extensions
for Zephyr without the need to have the full Zephyr source tree.
if LLEXT_EDK
config LLEXT_EDK_NAME config LLEXT_EDK_NAME
string "Name for llext EDK (Extension Development Kit)" string "Name for llext EDK (Extension Development Kit)"
@ -145,4 +154,4 @@ config LLEXT_EDK_USERSPACE_ONLY
to be used by userspace only extensions, this option will make EDK stubs to be used by userspace only extensions, this option will make EDK stubs
not contain the routing code, and only generate the userspace one. not contain the routing code, and only generate the userspace one.
endmenu endif