lcd/Kconfig, Make.defs: Remove dependency of CONFIG_LCD_NXDRIVER for building non-graphic, SLCD drivers.

This commit is contained in:
Gregory Nutt
2016-05-26 07:21:14 -06:00
parent 783bab6c82
commit e57a6d14c3
4 changed files with 55 additions and 20 deletions
+34 -2
View File
@@ -3,7 +3,23 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
comment "Common LCD Settings"
menu "LCD Driver Support"
menuconfig LCD
bool "Graphic LCD Driver Support"
default n
select NX_LCDDRIVER if NX
---help---
Drivers for parallel and serial LCD and OLED type devices. These
drivers support interfaces as defined in include/nuttx/lcd/lcd.h
This selection is necessary to enable support for LCD drivers in
drivers/lcd as well as for board-specific LCD drivers in the configs/
subdirectories.
if LCD
comment "Common Graphipc LCD Settings"
config LCD_CONSOLE
bool "LCD console output"
@@ -990,8 +1006,21 @@ config LCD_RA8875_EXTENDED
driver anyway.
endif # LCD_RA8875
endif # LCD
comment "Alphanumeric/Segment LCD Devices"
menuconfig SLCD
bool "Alphanumeric/Segment LCD Devices"
default n
---help---
Drivers for Alphanumeric ans Segment LCDs (SLCDs). These
drivers support interfaces as defined in include/nuttx/lcd/slcd_ioctl.h
amd slcd_codec.h
This selection is necessary to enable support for SLCD drivers in
drivers/lcd as well as for board-specific LCD drivers in the configs/
subdirectories.
if SLCD
config LCD_LCD1602
bool "LCD 1602"
@@ -1018,3 +1047,6 @@ config LCD_BACKPACK
This driver supports known and unknown variants.
See pcf8574_lcd_backpack_readme.txt
endif # SLCD
endmenu # LCD Driver Support
+17 -2
View File
@@ -37,7 +37,7 @@
ifeq ($(CONFIG_NX_LCDDRIVER),y)
# Include LCD drivers
# Include Graphics LCD drivers
ifeq ($(CONFIG_LCD_P14201),y)
CSRCS += p14201.c
@@ -103,6 +103,22 @@ ifeq ($(CONFIG_LCD_RA8875),y)
CSRCS += ra8875.c
endif
# Include Alphanumeric/Segment LCD drivers too
ifeq ($(CONFIG_LCD_BACKPACK),y)
CSRCS += pcf8574_lcd_backpack.c
endif
# Include LCD driver build support
DEPPATH += --dep-path lcd
VPATH += :lcd
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)lcd}
else ifeq ($(CONFIG_SLCD),y)
# Include Alphanumeric/Segment LCD drivers only
ifeq ($(CONFIG_LCD_BACKPACK),y)
CSRCS += pcf8574_lcd_backpack.c
endif
@@ -113,4 +129,3 @@ DEPPATH += --dep-path lcd
VPATH += :lcd
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)lcd}
endif