diff options
| -rw-r--r-- | payloads/libpayload/Config.in | 5 | ||||
| -rw-r--r-- | payloads/libpayload/configs/config.purin | 2 | ||||
| -rw-r--r-- | payloads/libpayload/drivers/Makefile.inc | 1 | ||||
| -rw-r--r-- | payloads/libpayload/drivers/serial/cygnus.c | 49 |
4 files changed, 1 insertions, 56 deletions
diff --git a/payloads/libpayload/Config.in b/payloads/libpayload/Config.in index ed6d91c1f9..455d058dcc 100644 --- a/payloads/libpayload/Config.in +++ b/payloads/libpayload/Config.in @@ -214,11 +214,6 @@ config BG4CD_SERIAL_CONSOLE depends on SERIAL_CONSOLE default n -config CYGNUS_SERIAL_CONSOLE - bool "Serial port driver for Cygnus" - depends on SERIAL_CONSOLE - default n - config PL011_SERIAL_CONSOLE bool "PL011 compatible serial port driver" depends on 8250_SERIAL_CONSOLE diff --git a/payloads/libpayload/configs/config.purin b/payloads/libpayload/configs/config.purin index 9482eb6ac7..e2d0d7c857 100644 --- a/payloads/libpayload/configs/config.purin +++ b/payloads/libpayload/configs/config.purin @@ -32,7 +32,7 @@ CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_SERIAL_CONSOLE=y # CONFIG_LP_8250_SERIAL_CONSOLE is not set # CONFIG_LP_S5P_SERIAL_CONSOLE is not set -# CONFIG_LP_8250_MMIO32_SERIAL_CONSOLE is not set +CONFIG_LP_8250_MMIO32_SERIAL_CONSOLE=y # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set # CONFIG_LP_BG4CD_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set diff --git a/payloads/libpayload/drivers/Makefile.inc b/payloads/libpayload/drivers/Makefile.inc index b5f6c16e22..61b0034a28 100644 --- a/payloads/libpayload/drivers/Makefile.inc +++ b/payloads/libpayload/drivers/Makefile.inc @@ -38,7 +38,6 @@ libc-$(CONFIG_LP_S5P_SERIAL_CONSOLE) += serial/s5p.c libc-$(CONFIG_LP_8250_MMIO32_SERIAL_CONSOLE) += serial/8250_mmio32.c libc-$(CONFIG_LP_IPQ806X_SERIAL_CONSOLE) += serial/ipq806x.c libc-$(CONFIG_LP_BG4CD_SERIAL_CONSOLE) += serial/bg4cd.c -libc-$(CONFIG_LP_CYGNUS_SERIAL_CONSOLE) += serial/cygnus.c libc-$(CONFIG_LP_PC_KEYBOARD) += keyboard.c libc-$(CONFIG_LP_CBMEM_CONSOLE) += cbmem_console.c diff --git a/payloads/libpayload/drivers/serial/cygnus.c b/payloads/libpayload/drivers/serial/cygnus.c deleted file mode 100644 index d822f101a5..0000000000 --- a/payloads/libpayload/drivers/serial/cygnus.c +++ /dev/null @@ -1,49 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2015 Google Electronics - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ -#include <libpayload-config.h> -#include <libpayload.h> - -void serial_putchar(unsigned int c) -{ -} - -int serial_havechar(void) -{ - return 0; -} - -int serial_getchar(void) -{ - return 0; -} - -static struct console_input_driver consin = { - .havekey = &serial_havechar, - .getchar = &serial_getchar -}; - -static struct console_output_driver consout = { - .putchar = &serial_putchar -}; - -void serial_console_init(void) -{ - console_add_input_driver(&consin); - console_add_output_driver(&consout); -} |