Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31337 )
Change subject: superio/nsc/pc87417: Use common early_serial ......................................................................
superio/nsc/pc87417: Use common early_serial
Change-Id: If32fa5970ca7ca634833a0e39da66c1f89ed33fe Signed-off-by: Peter Lemenkov lemenkov@gmail.com Reviewed-on: https://review.coreboot.org/c/31337 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Felix Held felix-coreboot@felixheld.de --- M src/superio/nsc/pc87417/Kconfig M src/superio/nsc/pc87417/Makefile.inc D src/superio/nsc/pc87417/early_serial.c M src/superio/nsc/pc87417/pc87417.h 4 files changed, 1 insertion(+), 33 deletions(-)
Approvals: build bot (Jenkins): Verified Felix Held: Looks good to me, approved
diff --git a/src/superio/nsc/pc87417/Kconfig b/src/superio/nsc/pc87417/Kconfig index 3237e7f..347bab2 100644 --- a/src/superio/nsc/pc87417/Kconfig +++ b/src/superio/nsc/pc87417/Kconfig @@ -15,3 +15,4 @@
config SUPERIO_NSC_PC87417 bool + select SUPERIO_NSC_COMMON_PRE_RAM diff --git a/src/superio/nsc/pc87417/Makefile.inc b/src/superio/nsc/pc87417/Makefile.inc index 4294561..b9f0b10 100644 --- a/src/superio/nsc/pc87417/Makefile.inc +++ b/src/superio/nsc/pc87417/Makefile.inc @@ -18,6 +18,4 @@
bootblock-$(CONFIG_SUPERIO_NSC_PC87417) += early_init.c romstage-$(CONFIG_SUPERIO_NSC_PC87417) += early_init.c -bootblock-$(CONFIG_SUPERIO_NSC_PC87417) += early_serial.c -romstage-$(CONFIG_SUPERIO_NSC_PC87417) += early_serial.c ramstage-$(CONFIG_SUPERIO_NSC_PC87417) += superio.c diff --git a/src/superio/nsc/pc87417/early_serial.c b/src/superio/nsc/pc87417/early_serial.c deleted file mode 100644 index 372709a..0000000 --- a/src/superio/nsc/pc87417/early_serial.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2000 AG Electronics Ltd. - * Copyright (C) 2003-2004 Linux Networx - * Copyright (C) 2004 Tyan - * - * 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; either version 2 of the License, or - * (at your option) any later version. - * - * 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. - */ - -#include <arch/io.h> -#include <device/pnp.h> -#include <stdint.h> -#include "pc87417.h" - -void pc87417_enable_serial(pnp_devfn_t dev, u16 iobase) -{ - pnp_set_logical_device(dev); - pnp_set_enable(dev, 0); - pnp_set_iobase(dev, PNP_IDX_IO0, iobase); - pnp_set_enable(dev, 1); -} diff --git a/src/superio/nsc/pc87417/pc87417.h b/src/superio/nsc/pc87417/pc87417.h index f118308..b50a920 100644 --- a/src/superio/nsc/pc87417/pc87417.h +++ b/src/superio/nsc/pc87417/pc87417.h @@ -113,7 +113,6 @@ #include <arch/io.h> #include <stdint.h>
-void pc87417_enable_serial(pnp_devfn_t dev, u16 iobase); void pc87417_disable_dev(pnp_devfn_t dev); void pc87417_enable_dev(pnp_devfn_t dev);