summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Lemenkov <lemenkov@gmail.com>2019-02-10 23:22:13 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-02-14 07:54:40 +0000
commit485937fd4f184374ca95fe9541d3cf1e18d0c21b (patch)
tree61c4c022028c21624798f9c1b13b564163bfa79c /src
parent05383287a1a4e1f1bcf64a784c51b24b9cfe97ae (diff)
downloadcoreboot-485937fd4f184374ca95fe9541d3cf1e18d0c21b.tar.xz
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>
Diffstat (limited to 'src')
-rw-r--r--src/superio/nsc/pc87360/Kconfig1
-rw-r--r--src/superio/nsc/pc87360/Makefile.inc2
-rw-r--r--src/superio/nsc/pc87360/early_serial.c29
-rw-r--r--src/superio/nsc/pc87360/pc87360.h5
4 files changed, 1 insertions, 36 deletions
diff --git a/src/superio/nsc/pc87360/Kconfig b/src/superio/nsc/pc87360/Kconfig
index cd432b4cda..b70b935cb9 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 e0ee98af1e..81e2d3d197 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 371761ed5c..0000000000
--- 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 31680b4d7d..c9697464d2 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 */