Skip to content

[Backport v4.2-branch] modules: lvgl: Fix stdlib usage #97838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: v4.2-branch
Choose a base branch
from
+6 −4
Open

[Backport v4.2-branch] modules: lvgl: Fix stdlib usage #97838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions modules/lvgl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ zephyr_include_directories(${LVGL_DIR}/src/)
zephyr_include_directories(include)

zephyr_compile_definitions(LV_CONF_INCLUDE_SIMPLE=1)
zephyr_library_compile_definitions(_POSIX_C_SOURCE=200809L)
zephyr_compile_definitions(LV_CONF_PATH="${CMAKE_CURRENT_SOURCE_DIR}/include/lv_conf.h")

zephyr_library_sources(
Expand Down Expand Up @@ -309,6 +310,8 @@ zephyr_library_sources(
${LVGL_DIR}/src/stdlib/builtin/lv_sprintf_builtin.c
${LVGL_DIR}/src/stdlib/builtin/lv_string_builtin.c
${LVGL_DIR}/src/stdlib/builtin/lv_tlsf.c
${LVGL_DIR}/src/stdlib/clib/lv_string_clib.c
${LVGL_DIR}/src/stdlib/clib/lv_sprintf_clib.c

${LVGL_DIR}/src/stdlib/clib/lv_mem_core_clib.c
${LVGL_DIR}/src/stdlib/clib/lv_sprintf_clib.c
Expand Down
7 changes: 3 additions & 4 deletions modules/lvgl/include/lv_conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@

/* Memory manager settings */

#define LV_USE_STDLIB_MALLOC LV_STDLIB_CUSTOM
#define LV_USE_STDLIB_MALLOC LV_STDLIB_CUSTOM
#define LV_USE_STDLIB_STRING LV_STDLIB_CLIB
#define LV_USE_STDLIB_SPRINTF LV_STDLIB_CLIB

#if defined(CONFIG_LV_Z_MEM_POOL_HEAP_LIB_C)
#define LV_STDLIB_INCLUDE "stdlib.h"
Expand All @@ -26,9 +28,6 @@
#define lv_free_core lvgl_free
#endif

/* Misc settings */
#define lv_snprintf snprintf
#define lv_vsnprintf vsnprintf
#define LV_ASSERT_HANDLER __ASSERT_NO_MSG(false);
#define LV_ASSERT_HANDLER_INCLUDE "zephyr/sys/__assert.h"

Expand Down
Loading