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.
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
Move LVGL gluecode back into main repository #61300
Conversation
The following west manifest projects have been modified in this Pull Request:
Note: This message is automatically posted and updated by the Manifest GitHub Action. |
401fe39
to
e7206fb
Compare
e7206fb
to
a563c37
Compare
@fabiobaltieri I merged the changes from pull/44 into here. Building the sample works fine for me, but there are still some CI issues and I have no idea on how I can resolve them: Simply put I need to somehow source the Kconfig from the module but don't know what the right way to do it is, considering I also have code in the zephyr main repo. Do you have any insights here :^) ? |
Yeah so you want the module system to only include the Kconfig when it's there, just drop diff --git a/zephyr/module.yml b/zephyr/module.yml
index e0e7d676..38ef2dd2 100644
--- a/zephyr/module.yml
+++ b/zephyr/module.yml
@@ -2,5 +2,4 @@
name: lvgl
build:
cmake-ext: True
- kconfig-ext: True
kconfig: Kconfig Then the Kconfig that is always there needs to have stub symbols with defined types for everything that is overridden at board level, apply this: diff --git a/modules/lvgl/Kconfig b/modules/lvgl/Kconfig
index 43b187abee..9d1b1bc1da 100644
--- a/modules/lvgl/Kconfig
+++ b/modules/lvgl/Kconfig
@@ -11,9 +11,14 @@ config LVGL
if LVGL
-source "${ZEPHYR_LVGL_MODULE_DIR}/Kconfig"
+config LV_USE_MONKEY
+ bool
+
+config LV_DPI_DEF
+ int
config LV_CONF_SKIP
+ bool
default n
config APP_LINK_WITH_LVGL
@@ -25,7 +30,7 @@ config APP_LINK_WITH_LVGL
issues for 'app'.
config LV_Z_USE_FILESYSTEM
- bool "Enable file system"
+ bool "LVGL file system support"
depends on FILE_SYSTEM
default y if FILE_SYSTEM
help |
By the way, you can run the compliance checks locally with |
a563c37
to
caa9780
Compare
Thanks @fabiobaltieri for the hints, apart from a checkpatch false positive everything builds fine now. |
Thanks for taking care of this, looks good, should be a single commit though so if a bisect lands on the first one it builds correctly. |
caa9780
to
ff3142d
Compare
Squashed the commits down :^) |
Moves back the module specific gluecode into the main repository Signed-off-by: Fabian Blatz <fabianblatz@gmail.com>
ff3142d
to
31cf4a8
Compare
Adjusted all include guards, updated revision :^) |
@gmarull @jfischer-no @danieldegrasse any second approval for this? The CI fail is a false positive. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for taking this on- looks good to me, tested on an RT1170 with the LVGL benchmark and widgets demos and everything seems functional
Addresses: #60868
The related PR in the module: zephyrproject-rtos/lvgl#45.