From f5443d2fd26f2ddbd2a19736e7c861c48d68ab84 Mon Sep 17 00:00:00 2001 From: Fabian Blatz Date: Fri, 5 Jul 2024 00:16:25 +0200 Subject: [PATCH] feat(env): make LVGL a Zephyr compatible module (#6460) --- Kconfig | 2 +- env_support/cmake/zephyr.cmake | 2 +- env_support/zephyr/module.yml | 2 -- zephyr/Kconfig | 3 +++ zephyr/module.yml | 5 +++++ 5 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 env_support/zephyr/module.yml create mode 100644 zephyr/Kconfig create mode 100644 zephyr/module.yml diff --git a/Kconfig b/Kconfig index a69c1672e..3599a70d6 100644 --- a/Kconfig +++ b/Kconfig @@ -871,7 +871,7 @@ menu "LVGL configuration" config LV_TXT_BREAK_CHARS string "Can break (wrap) texts on these chars" - default " ,.;:-_)]}" + default " ,.;:-_)}" config LV_TXT_LINE_BREAK_LONG_LEN int "Line break long length" diff --git a/env_support/cmake/zephyr.cmake b/env_support/cmake/zephyr.cmake index f9ae517e7..7ab4654fb 100644 --- a/env_support/cmake/zephyr.cmake +++ b/env_support/cmake/zephyr.cmake @@ -4,7 +4,7 @@ if(CONFIG_LVGL) target_include_directories(lvgl INTERFACE ${LVGL_ROOT_DIR}) - zephyr_compile_definitions(LV_CONF_KCONFIG_EXTERNAL_INCLUDE=) + zephyr_compile_definitions(LV_CONF_KCONFIG_EXTERNAL_INCLUDE=) zephyr_library() diff --git a/env_support/zephyr/module.yml b/env_support/zephyr/module.yml deleted file mode 100644 index eb317c3ce..000000000 --- a/env_support/zephyr/module.yml +++ /dev/null @@ -1,2 +0,0 @@ -build: - cmake: . diff --git a/zephyr/Kconfig b/zephyr/Kconfig new file mode 100644 index 000000000..53fcdbb8d --- /dev/null +++ b/zephyr/Kconfig @@ -0,0 +1,3 @@ +if LVGL +rsource "../Kconfig" +endif diff --git a/zephyr/module.yml b/zephyr/module.yml new file mode 100644 index 000000000..e63b25b7b --- /dev/null +++ b/zephyr/module.yml @@ -0,0 +1,5 @@ +# https://docs.zephyrproject.org/latest/guides/modules.html +name: lvgl +build: + cmake-ext: True + kconfig: zephyr/Kconfig