Commit 24c764ab authored by Mans Rullgard's avatar Mans Rullgard Committed by Miguel Ojeda
Browse files

auxdisplay: deconfuse configuration 



The auxdisplay Kconfig is confusing.  It creates two separate menus
even though the settings are closely related.  Moreover, the options
for setting the boot message depend on CONFIG_PARPORT even though they
are used by drivers that do not.

Clear up the confusion by moving the "Parallel port LCD/Keypad" menu
under auxdisplay where it logically belongs.  Change the boot message
options to depend only on CONFIG_CHARLCD, making them accessible also
when only the HD44780 is selected.

Since the "Parallel port LCD/Keypad" driver now has a new dependency
on CONFIG_AUXDISPLAY, rename its Kconfig symbol and keep the old one
such that make oldconfig will not disable the driver.

Signed-off-by: default avatarMans Rullgard <mans@mansr.com>
Signed-off-by: default avatarMiguel Ojeda <miguel.ojeda.sandonis@gmail.com>
parent cb79eb95

drivers/auxdisplay/Kconfig

+12 −5
Original line number Diff line number Diff line
@@ -164,9 +164,7 @@ config ARM_CHARLCD 
	  line and the Linux version on the second line, but that's

	  still useful.



endif # AUXDISPLAY



menuconfig PANEL

menuconfig PARPORT_PANEL

	tristate "Parallel port LCD/Keypad Panel support"

	depends on PARPORT

	select CHARLCD
@@ -178,7 +176,7 @@ menuconfig PANEL 
	  compiled as a module, or linked into the kernel and started at boot.

	  If you don't understand what all this is about, say N.



if PANEL

if PARPORT_PANEL



config PANEL_PARPORT

	int "Default parallel port number (0=LPT1)"
@@ -419,8 +417,11 @@ config PANEL_LCD_PIN_BL 


	  Default for the 'BL' pin in custom profile is '0' (uncontrolled).



endif # PARPORT_PANEL



config PANEL_CHANGE_MESSAGE

	bool "Change LCD initialization message ?"

	depends on CHARLCD

	default "n"

	---help---

	  This allows you to replace the boot message indicating the kernel version
@@ -444,7 +445,13 @@ config PANEL_BOOT_MESSAGE 
	  An empty message will only clear the display at driver init time. Any other

	  printf()-formatted message is valid with newline and escape codes.



endif # PANEL

endif # AUXDISPLAY



config PANEL

	tristate "Parallel port LCD/Keypad Panel support (OLD OPTION)"

	depends on PARPORT

	select AUXDISPLAY

	select PARPORT_PANEL



config CHARLCD

	tristate "Character LCD core support" if COMPILE_TEST

drivers/auxdisplay/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,4 +10,4 @@ obj-$(CONFIG_CFAG12864B) += cfag12864b.o cfag12864bfb.o 
obj-$(CONFIG_IMG_ASCII_LCD)	+= img-ascii-lcd.o

obj-$(CONFIG_HD44780)		+= hd44780.o

obj-$(CONFIG_HT16K33)		+= ht16k33.o

obj-$(CONFIG_PANEL)             += panel.o
 
obj-$(CONFIG_PARPORT_PANEL)	+= panel.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE