From 28d9fe7641758a3e4201c444e64d5cb2f0b3375b Mon Sep 17 00:00:00 2001 From: Tomas Rezucha Date: Tue, 23 Feb 2021 20:27:56 +0100 Subject: [PATCH] Fix Kconfig name --- KConfig | 2 -- Kconfig | 2 ++ component.mk | 11 +++++------ 3 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 KConfig create mode 100644 Kconfig diff --git a/KConfig b/KConfig deleted file mode 100644 index 80509c6..0000000 --- a/KConfig +++ /dev/null @@ -1,2 +0,0 @@ -rsource "lvgl_tft/Kconfig" -rsource "lvgl_touch/KConfig" diff --git a/Kconfig b/Kconfig new file mode 100644 index 0000000..ae11925 --- /dev/null +++ b/Kconfig @@ -0,0 +1,2 @@ +rsource "lvgl_tft/Kconfig" +rsource "lvgl_touch/Kconfig" diff --git a/component.mk b/component.mk index 1ce9d8f..dbd1105 100644 --- a/component.mk +++ b/component.mk @@ -1,7 +1,7 @@ # LVGL ESP32 drivers -# Compile everything in this folder unconditionally -COMPONENT_SRCDIRS := . +# Define sources and include dirs +COMPONENT_SRCDIRS := . lvgl_tft lvgl_touch COMPONENT_ADD_INCLUDEDIRS := . # LVGL is supposed to be used as a ESP-IDF component @@ -11,10 +11,9 @@ CFLAGS += -DLV_LVGL_H_INCLUDE_SIMPLE # TFT display drivers COMPONENT_ADD_INCLUDEDIRS += lvgl_tft -COMPONENT_OBJS := lvgl_tft/disp_driver.o $(call compile_only_if,$(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9341),lvgl_tft/ili9341.o) -$(call compile_only_if,$(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9481),lvgl_tft/ili9491.o) +$(call compile_only_if,$(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9481),lvgl_tft/ili9481.o) $(call compile_only_if,$(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9486),lvgl_tft/ili9486.o) $(call compile_only_if,$(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9488),lvgl_tft/ili9488.o) $(call compile_only_if,$(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ST7789),lvgl_tft/st7789.o) @@ -29,7 +28,7 @@ $(call compile_only_if,$(CONFIG_LV_TFT_DISPLAY_CONTROLLER_IL3820),lvgl_tft/il382 $(call compile_only_if,$(CONFIG_LV_TFT_DISPLAY_CONTROLLER_JD79653A),lvgl_tft/jd79653a.o) $(call compile_only_if,$(CONFIG_LV_TFT_DISPLAY_CONTROLLER_UC8151D),lvgl_tft/uc8151d.o) $(call compile_only_if,$(CONFIG_LV_TFT_DISPLAY_CONTROLLER_RA8875),lvgl_tft/ra8875.o) -$(call compile_only_if,$(CONFIG_LV_TFT_DISPLAY_CONTROLLER_GC9A01),lvgl_tft/gc9a01.o) +$(call compile_only_if,$(CONFIG_LV_TFT_DISPLAY_CONTROLLER_GC9A01),lvgl_tft/GC9A01.o) $(call compile_only_if,$(CONFIG_LV_TFT_DISPLAY_PROTOCOL_SPI),lvgl_tft/disp_spi.o) @@ -37,7 +36,7 @@ $(call compile_only_if,$(CONFIG_LV_TFT_DISPLAY_PROTOCOL_SPI),lvgl_tft/disp_spi.o COMPONENT_ADD_INCLUDEDIRS += lvgl_touch $(call compile_only_if,$(CONFIG_LV_TOUCH_CONTROLLER),lvgl_touch/touch_driver.o) -$(call compile_only_if,$(and $(CONFIG_LV_TOUCH_CONTROLLER),$(CONFIG_LV_TOUCH_CONTROLLER_XPT2046T)), lvgl_touch/xpt2046.o) +$(call compile_only_if,$(and $(CONFIG_LV_TOUCH_CONTROLLER),$(CONFIG_LV_TOUCH_CONTROLLER_XPT2046)), lvgl_touch/xpt2046.o) $(call compile_only_if,$(and $(CONFIG_LV_TOUCH_CONTROLLER),$(CONFIG_LV_TOUCH_CONTROLLER_FT6X06)), lvgl_touch/ft6x36.o) $(call compile_only_if,$(and $(CONFIG_LV_TOUCH_CONTROLLER),$(CONFIG_LV_TOUCH_CONTROLLER_STMPE610)), lvgl_touch/stmpe610.o) $(call compile_only_if,$(and $(CONFIG_LV_TOUCH_CONTROLLER),$(CONFIG_LV_TOUCH_CONTROLLER_ADCRAW)), lvgl_touch/adcraw.o)