From 3a2a423214be45d75626a20b89cfbcf48ec40bf5 Mon Sep 17 00:00:00 2001 From: Alan Carvalho de Assis Date: Fri, 30 Nov 2018 17:36:13 -0600 Subject: [PATCH] drivers/lcd/Kconfig and several other places: Rename CONFIG_LCD_CONSOLE to CONFIG_SLCD_CONSOLE. The original name CONFIG_LCD_CONSOLE is incorrect because it runs on SLCD display. This patch fix it and update its dependences --- arch/renesas/src/common/up_internal.h | 2 +- arch/renesas/src/m16c/m16c_lowputc.c | 8 ++++---- arch/renesas/src/m16c/m16c_serial.c | 4 ++-- configs/skp16c26/ostest/defconfig | 4 ++-- configs/skp16c26/src/m16c_lcd.c | 4 ++-- configs/skp16c26/src/m16c_lcdconsole.c | 5 +++-- drivers/lcd/Kconfig | 22 +++++++++++----------- 7 files changed, 25 insertions(+), 24 deletions(-) diff --git a/arch/renesas/src/common/up_internal.h b/arch/renesas/src/common/up_internal.h index 1839c763d3..f107a0d1e6 100644 --- a/arch/renesas/src/common/up_internal.h +++ b/arch/renesas/src/common/up_internal.h @@ -191,7 +191,7 @@ void renesas_timer_initialize(void); /* Defined in board/xyz_lcd.c */ -#ifdef CONFIG_LCD_CONSOLE +#ifdef CONFIG_SLCD_CONSOLE void up_lcdinit(void); void up_lcdputc(char ch); #else diff --git a/arch/renesas/src/m16c/m16c_lowputc.c b/arch/renesas/src/m16c/m16c_lowputc.c index ecda734380..b0d37554e1 100644 --- a/arch/renesas/src/m16c/m16c_lowputc.c +++ b/arch/renesas/src/m16c/m16c_lowputc.c @@ -90,9 +90,9 @@ # undef HAVE_SERIALCONSOLE #endif -#if defined(HAVE_SERIALCONSOLE) && defined(CONFIG_LCD_CONSOLE) +#if defined(HAVE_SERIALCONSOLE) && defined(CONFIG_SLCD_CONSOLE) # error "Both serial and LCD consoles are defined" -#elif !defined(HAVE_SERIALCONSOLE) && !defined(CONFIG_LCD_CONSOLE) +#elif !defined(HAVE_SERIALCONSOLE) && !defined(CONFIG_SLCD_CONSOLE) # warning "No console is defined" #endif @@ -298,7 +298,7 @@ static inline void up_lowserialsetup(void) * ****************************************************************************/ -#if defined(HAVE_SERIAL) && !defined(CONFIG_LCD_CONSOLE) +#if defined(HAVE_SERIAL) && !defined(CONFIG_SLCD_CONSOLE) void up_lowputc(char ch) { #ifdef HAVE_SERIALCONSOLE @@ -335,7 +335,7 @@ void up_lowsetup(void) /* The LCD is initialized here if the LCD is used for console output. */ -#ifdef CONFIG_LCD_CONSOLE +#ifdef CONFIG_SLCD_CONSOLE up_lcdinit(); #endif } diff --git a/arch/renesas/src/m16c/m16c_serial.c b/arch/renesas/src/m16c/m16c_serial.c index 9b4a522f76..eb41506051 100644 --- a/arch/renesas/src/m16c/m16c_serial.c +++ b/arch/renesas/src/m16c/m16c_serial.c @@ -130,9 +130,9 @@ # undef CONFIG_UART2_SERIAL_CONSOLE #endif -#if defined(HAVE_SERIALCONSOLE) && defined(CONFIG_LCD_CONSOLE) +#if defined(HAVE_SERIALCONSOLE) && defined(CONFIG_SLCD_CONSOLE) # error "Both serial and LCD consoles are defined" -#elif !defined(HAVE_SERIALCONSOLE) && !defined(CONFIG_LCD_CONSOLE) +#elif !defined(HAVE_SERIALCONSOLE) && !defined(CONFIG_SLCD_CONSOLE) # warning "No console is defined" #endif diff --git a/configs/skp16c26/ostest/defconfig b/configs/skp16c26/ostest/defconfig index c1ed30d1fd..e018a0558f 100644 --- a/configs/skp16c26/ostest/defconfig +++ b/configs/skp16c26/ostest/defconfig @@ -15,8 +15,6 @@ CONFIG_DISABLE_POLL=y CONFIG_ENDIAN_BIG=y CONFIG_EXAMPLES_OSTEST=y CONFIG_IDLETHREAD_STACKSIZE=256 -CONFIG_LCD_CONSOLE=y -CONFIG_LCD=y CONFIG_MAX_TASKS=8 CONFIG_MAX_WDOGPARMS=2 CONFIG_MOTOROLA_SREC=y @@ -32,6 +30,8 @@ CONFIG_RAM_SIZE=2048 CONFIG_RAM_START=0x00400 CONFIG_RR_INTERVAL=200 CONFIG_SDCLONE_DISABLE=y +CONFIG_SLCD=y +CONFIG_SLCD_CONSOLE=y CONFIG_START_DAY=20 CONFIG_START_MONTH=2 CONFIG_START_YEAR=2009 diff --git a/configs/skp16c26/src/m16c_lcd.c b/configs/skp16c26/src/m16c_lcd.c index fdbf97606f..1ba300c26e 100644 --- a/configs/skp16c26/src/m16c_lcd.c +++ b/configs/skp16c26/src/m16c_lcd.c @@ -47,7 +47,7 @@ #include "up_internal.h" #include "chip.h" -#ifdef CONFIG_LCD +#ifdef CONFIG_SLCD /************************************************************************************ * Pre-processor Definitions @@ -280,4 +280,4 @@ void up_lcdputc(char ch) } } -#endif /* CONFIG_LCD */ +#endif /* CONFIG_SLCD */ diff --git a/configs/skp16c26/src/m16c_lcdconsole.c b/configs/skp16c26/src/m16c_lcdconsole.c index 3c3f98634e..f8be2e8158 100644 --- a/configs/skp16c26/src/m16c_lcdconsole.c +++ b/configs/skp16c26/src/m16c_lcdconsole.c @@ -56,7 +56,8 @@ # undef HAVE_SERIALCONSOLE #endif -#if !defined(HAVE_SERIALCONSOLE) && defined(CONFIG_LCD) && defined(CONFIG_LCD_CONSOLE) +#if !defined(HAVE_SERIALCONSOLE) && defined(CONFIG_SLCD) && \ + defined(CONFIG_SLCD_CONSOLE) /************************************************************************************ * Pre-processor Definitions @@ -138,4 +139,4 @@ int up_putc(int ch) return ch; } -#endif /* !HAVE_SERIALCONSOLE && CONFIG_LCD && CONFIG_LCD_CONSOLE */ +#endif /* !HAVE_SERIALCONSOLE && CONFIG_SLCD && CONFIG_SLCD_CONSOLE */ diff --git a/drivers/lcd/Kconfig b/drivers/lcd/Kconfig index 18a7c701af..c045ec21dc 100644 --- a/drivers/lcd/Kconfig +++ b/drivers/lcd/Kconfig @@ -58,17 +58,6 @@ config LCD_EXTERNINIT menu "LCD driver selection" -config LCD_CONSOLE - bool "LCD console output" - default n - ---help--- - It is possible to use an SLCD to provide console output. This option - enables that possibility. - - At present, only one architecture supports this option (M16C). - However, this feature could be provided by other architectures in - the future. - config LCD_NOGETRUN bool "Write-only LCD" default n @@ -1172,6 +1161,17 @@ menuconfig SLCD if SLCD +config SLCD_CONSOLE + bool "SLCD console output" + default n + ---help--- + It is possible to use an SLCD to provide console output. This option + enables that possibility. + + At present, only one architecture supports this option (M16C). + However, this feature could be provided by other architectures in + the future. + config LCD_LCD1602 bool "LCD 1602" default n