From 45926270f2bd60cca8ebcfce810bcfc679b5d0ce Mon Sep 17 00:00:00 2001 From: "wanwei.jiang" Date: Thu, 13 Jan 2022 19:37:51 +0800 Subject: [PATCH] serial: modify config name and select some config [1/1] PD#SWPL-64397 Problem: 1. modify config name and select some config Solution: 1. modify config name and select some config Verify: s4d Change-Id: I165ece6c465bb5077df8daf11b82e1ea55aaf989 Signed-off-by: wanwei.jiang --- arch/arm64/configs/amlogic_gki.fragment | 4 ++-- drivers/tty/serial/Kconfig | 28 ++++++++++++------------- drivers/tty/serial/Makefile | 4 +++- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/arch/arm64/configs/amlogic_gki.fragment b/arch/arm64/configs/amlogic_gki.fragment index 676022eb1..1c13923fc 100644 --- a/arch/arm64/configs/amlogic_gki.fragment +++ b/arch/arm64/configs/amlogic_gki.fragment @@ -4,8 +4,8 @@ CONFIG_AMLOGIC_DRIVER=y CONFIG_AMLOGIC_MODIFY=y CONFIG_DEVTMPFS=y -# meson_uart.ko -CONFIG_AMLOGIC_UART=y +# meson_uart built into kernel +CONFIG_AMLOGIC_SERIAL_MESON=y CONFIG_AMLOGIC_SERIAL_MESON_CONSOLE=y # amlogic-clk.ko diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index 66b067d15..2c635cdd3 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -1,24 +1,24 @@ +# SPDX-License-Identifier: (GPL-2.0+ OR MIT) # # Amlogic driver configuration # -config AMLOGIC_UART - tristate "Serial support" - depends on SERIAL_CORE +config AMLOGIC_SERIAL_MESON + tristate "Meson serial port support" + select SERIAL_CORE default n help - Add support for the Amlogic serial port. - this config only ctrl in makefile - this config do not in meson_uart.c - this config add + This enables the driver for the on-chip UARTs of the Amlogic + MesonX processors. config AMLOGIC_SERIAL_MESON_CONSOLE bool "Console on Amlogic Serial port" - depends on AMLOGIC_UART - depends on SERIAL_CORE_CONSOLE - depends on SERIAL_EARLYCON - default y + depends on AMLOGIC_SERIAL_MESON + select SERIAL_CORE_CONSOLE + select SERIAL_EARLYCON + default n help - Support for running a console on the Amlogic serial - this config is only - used in meson_uart.c + Say Y here if you wish to use a Amlogic MesonX UART as the + system console (the system console is the device which + receives all kernel messages and warnings and which allows + logins in single user mode) as /dev/ttyAMLx. diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile index 815158ed3..987cecc55 100644 --- a/drivers/tty/serial/Makefile +++ b/drivers/tty/serial/Makefile @@ -1 +1,3 @@ -obj-$(CONFIG_AMLOGIC_UART) += meson_uart.o \ No newline at end of file +# SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +obj-$(CONFIG_AMLOGIC_SERIAL_MESON) += meson_uart.o