Skip to content
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

Jump to bottom

buildsystem: fix kconfig mismatches #19813

Merged
merged 3 commits into from
Jul 9, 2023
Merged

buildsystem: fix kconfig mismatches #19813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cce395d
boards/esp32s3-box: select ili9341 when disp_dev is used
maribu Jul 9, 2023
69fb00b
boards/sipeed-longan-nano: default to variant with TFT
maribu Jul 9, 2023
ca07f77
drivers/st7735: fix inconsistency in dependency modeling
maribu Jul 9, 2023
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
4 changes: 4 additions & 0 deletions boards/esp32s3-box/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,9 @@ ifeq (,$(filter stdio_% slipdev_stdio usbus usbus% tinyusb_device,$(USEMODULE)))
# include $(RIOTMAKE)/tools/usb_board_reset.mk
endif

ifneq (,$(filter disp_dev,$(USEMODULE)))
USEMODULE += ili9341
endif

include $(RIOTBOARD)/common/esp32s3/Makefile.dep
include $(RIOTBOARD)/common/makefiles/stdio_cdc_acm.dep.mk
1 change: 1 addition & 0 deletions boards/sipeed-longan-nano/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ menu "Sipeed Longan Nano Board Configuration"

config SIPEED_LONGAN_NANO_WITH_TFT
bool "Board with TFT display"
default y
select HAVE_ST7735
help
Indicates that a Sipeed Longan Nano board with TFT display is used.
Expand Down
9 changes: 6 additions & 3 deletions drivers/st7735/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,15 @@ config HAVE_ST7735
Indicates that an ST7735 display is present.

config MODULE_ST7789
bool "ST7789 display driver"
select MODULE_ST7735
bool
depends on HAVE_ST7789
default y if MODULE_ST7735
help
ST7789 display driver

maribu marked this conversation as resolved.
Show resolved Hide resolved
config HAVE_ST7789
bool
select MODULE_ST7789 if MODULE_DISP_DEV
select MODULE_ST7735 if MODULE_DISP_DEV
help
Indicates that an ST7789 display is present.

Expand Down