Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31335 )
Change subject: superio/nsc/pc87360: Use common early_serial ......................................................................
superio/nsc/pc87360: Use common early_serial
Change-Id: Id866c30d676e3c3ff53bfc2547abffce6e9b5e07 Signed-off-by: Peter Lemenkov lemenkov@gmail.com Reviewed-on: https://review.coreboot.org/c/31335 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Felix Held felix-coreboot@felixheld.de --- M src/superio/nsc/pc87360/Kconfig M src/superio/nsc/pc87360/Makefile.inc D src/superio/nsc/pc87360/early_serial.c M src/superio/nsc/pc87360/pc87360.h 4 files changed, 1 insertion(+), 36 deletions(-)
Approvals: build bot (Jenkins): Verified Felix Held: Looks good to me, approved
diff --git a/src/superio/nsc/pc87360/Kconfig b/src/superio/nsc/pc87360/Kconfig index cd432b4..b70b935 100644 --- a/src/superio/nsc/pc87360/Kconfig +++ b/src/superio/nsc/pc87360/Kconfig @@ -15,3 +15,4 @@
config SUPERIO_NSC_PC87360 bool + select SUPERIO_NSC_COMMON_PRE_RAM diff --git a/src/superio/nsc/pc87360/Makefile.inc b/src/superio/nsc/pc87360/Makefile.inc index e0ee98a..81e2d3d 100644 --- a/src/superio/nsc/pc87360/Makefile.inc +++ b/src/superio/nsc/pc87360/Makefile.inc @@ -15,6 +15,4 @@ ## GNU General Public License for more details. ##
-bootblock-$(CONFIG_SUPERIO_NSC_PC87360) += early_serial.c -romstage-$(CONFIG_SUPERIO_NSC_PC87360) += early_serial.c ramstage-$(CONFIG_SUPERIO_NSC_PC87360) += superio.c diff --git a/src/superio/nsc/pc87360/early_serial.c b/src/superio/nsc/pc87360/early_serial.c deleted file mode 100644 index 371761e..0000000 --- a/src/superio/nsc/pc87360/early_serial.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2000 AG Electronics Ltd. - * Copyright (C) 2003-2004 Linux Networx - * - * 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 "pc87360.h" - -void pc87360_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/pc87360/pc87360.h b/src/superio/nsc/pc87360/pc87360.h index 31680b4..c969746 100644 --- a/src/superio/nsc/pc87360/pc87360.h +++ b/src/superio/nsc/pc87360/pc87360.h @@ -30,9 +30,4 @@ #define PC87360_FSCM 0x09 #define PC87360_WDT 0x0A
-#include <arch/io.h> -#include <stdint.h> - -void pc87360_enable_serial(pnp_devfn_t dev, u16 iobase); - #endif /* SUPERIO_NSC_PC87360_H */