From aec64457988b59b73ca0532bf9d4814e202dbdf3 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Wed, 19 May 2021 21:39:45 +0200 Subject: [PATCH 1/4] drivers/{disp,touch}_dev: pull auto_init_screen by default --- drivers/disp_dev/Kconfig | 1 + drivers/disp_dev/Makefile.dep | 1 + drivers/touch_dev/Kconfig | 1 + drivers/touch_dev/Makefile.dep | 1 + 4 files changed, 4 insertions(+) create mode 100644 drivers/disp_dev/Makefile.dep create mode 100644 drivers/touch_dev/Makefile.dep diff --git a/drivers/disp_dev/Kconfig b/drivers/disp_dev/Kconfig index 7e8345d158..0b595a5f67 100644 --- a/drivers/disp_dev/Kconfig +++ b/drivers/disp_dev/Kconfig @@ -8,3 +8,4 @@ config MODULE_DISP_DEV bool "Display device generic API" depends on TEST_KCONFIG + imply MODULE_AUTO_INIT_SCREEN diff --git a/drivers/disp_dev/Makefile.dep b/drivers/disp_dev/Makefile.dep new file mode 100644 index 0000000000..3a3b8f47e4 --- /dev/null +++ b/drivers/disp_dev/Makefile.dep @@ -0,0 +1 @@ +DEFAULT_MODULE += auto_init_screen diff --git a/drivers/touch_dev/Kconfig b/drivers/touch_dev/Kconfig index b82955c3d3..68d2f80873 100644 --- a/drivers/touch_dev/Kconfig +++ b/drivers/touch_dev/Kconfig @@ -8,5 +8,6 @@ config MODULE_TOUCH_DEV bool "Touch device generic API" depends on TEST_KCONFIG + imply MODULE_AUTO_INIT_SCREEN help This API is experimental and in an early state - expect changes! diff --git a/drivers/touch_dev/Makefile.dep b/drivers/touch_dev/Makefile.dep new file mode 100644 index 0000000000..3a3b8f47e4 --- /dev/null +++ b/drivers/touch_dev/Makefile.dep @@ -0,0 +1 @@ +DEFAULT_MODULE += auto_init_screen From 7d5051f2eca93e0719529ddc9de65f5ef94af9c2 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Wed, 19 May 2021 21:41:04 +0200 Subject: [PATCH 2/4] tests/{disp,touch}_dev: remove dependency to auto_init_screen --- tests/disp_dev/Makefile | 1 - tests/touch_dev/Makefile | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/disp_dev/Makefile b/tests/disp_dev/Makefile index 8c571927ad..4d728d33db 100644 --- a/tests/disp_dev/Makefile +++ b/tests/disp_dev/Makefile @@ -3,7 +3,6 @@ include ../Makefile.tests_common DISABLE_MODULE += test_utils_interactive_sync -USEMODULE += auto_init_screen USEMODULE += disp_dev include $(RIOTBASE)/Makefile.include diff --git a/tests/touch_dev/Makefile b/tests/touch_dev/Makefile index 9c9741e06b..6eea9d19e3 100644 --- a/tests/touch_dev/Makefile +++ b/tests/touch_dev/Makefile @@ -3,7 +3,6 @@ include ../Makefile.tests_common DISABLE_MODULE += test_utils_interactive_sync -USEMODULE += auto_init_screen USEMODULE += touch_dev USEMODULE += xtimer From 37bb39bcb910d21881c4bec339e5434bc4c13901 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Wed, 19 May 2021 21:40:26 +0200 Subject: [PATCH 3/4] pkg/lvgl: remove unnecessary dependency to auto_init_screen --- pkg/lvgl/Makefile.dep | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/lvgl/Makefile.dep b/pkg/lvgl/Makefile.dep index 7aa99187c1..f9de871957 100644 --- a/pkg/lvgl/Makefile.dep +++ b/pkg/lvgl/Makefile.dep @@ -17,8 +17,6 @@ ifneq (,$(filter lvgl_contrib_touch,$(USEMODULE))) USEMODULE += touch_dev endif -DEFAULT_MODULE += auto_init_screen - # lvgl is not compatible with non 32bit platforms # Building lv_misc triggers the error: # "left shift count >= width of type [-Werror=shift-count-overflow]" From 08049fbb798b89d52c09428d5a7ee236a22f2372 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Wed, 19 May 2021 21:41:39 +0200 Subject: [PATCH 4/4] tests/pkg_qr-code-generator: remove dependency to auto_init_screen --- tests/pkg_qr-code-generator/Kconfig | 1 - tests/pkg_qr-code-generator/Makefile.board.dep | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/pkg_qr-code-generator/Kconfig b/tests/pkg_qr-code-generator/Kconfig index 9e24515f19..e22856bd2b 100644 --- a/tests/pkg_qr-code-generator/Kconfig +++ b/tests/pkg_qr-code-generator/Kconfig @@ -1,7 +1,6 @@ config APPLICATION bool default y - imply MODULE_AUTO_INIT_SCREEN if BOARD_HAS_DISPLAY imply MODULE_DISP_DEV if BOARD_HAS_DISPLAY depends on TEST_KCONFIG diff --git a/tests/pkg_qr-code-generator/Makefile.board.dep b/tests/pkg_qr-code-generator/Makefile.board.dep index a925f698ad..debabcf92e 100644 --- a/tests/pkg_qr-code-generator/Makefile.board.dep +++ b/tests/pkg_qr-code-generator/Makefile.board.dep @@ -1,5 +1,4 @@ # Boards with a screen can use disp_dev ifneq (,$(filter stm32f429i-disc% pinetime adafruit-clue esp32-wrover-kit,$(BOARD))) - USEMODULE += auto_init_screen USEMODULE += disp_dev endif