summaryrefslogtreecommitdiff
path: root/src/superio
diff options
context:
space:
mode:
authorPeter Lemenkov <lemenkov@gmail.com>2019-02-10 23:18:41 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-02-14 07:54:31 +0000
commit05383287a1a4e1f1bcf64a784c51b24b9cfe97ae (patch)
treeac49bebd49095a4297a4e40630ccf03d12a4862e /src/superio
parent122457058ebc307ad83bbec54e06850f25c993a5 (diff)
superio/nsc/pc87309: Use common early_serial
Change-Id: If856ec6d5bcf4951d0e09464526239f5a508d4b0 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com> Reviewed-on: https://review.coreboot.org/c/31334 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Diffstat (limited to 'src/superio')
-rw-r--r--src/superio/nsc/pc87309/Kconfig1
-rw-r--r--src/superio/nsc/pc87309/Makefile.inc2
-rw-r--r--src/superio/nsc/pc87309/early_serial.c27
-rw-r--r--src/superio/nsc/pc87309/pc87309.h5
4 files changed, 1 insertions, 34 deletions
diff --git a/src/superio/nsc/pc87309/Kconfig b/src/superio/nsc/pc87309/Kconfig
index d4b841e88a..ff72706b34 100644
--- a/src/superio/nsc/pc87309/Kconfig
+++ b/src/superio/nsc/pc87309/Kconfig
@@ -15,3 +15,4 @@
config SUPERIO_NSC_PC87309
bool
+ select SUPERIO_NSC_COMMON_PRE_RAM
diff --git a/src/superio/nsc/pc87309/Makefile.inc b/src/superio/nsc/pc87309/Makefile.inc
index 0f0b3670bf..6c7a8ab367 100644
--- a/src/superio/nsc/pc87309/Makefile.inc
+++ b/src/superio/nsc/pc87309/Makefile.inc
@@ -14,6 +14,4 @@
## GNU General Public License for more details.
##
-bootblock-$(CONFIG_SUPERIO_NSC_PC87309) += early_serial.c
-romstage-$(CONFIG_SUPERIO_NSC_PC87309) += early_serial.c
ramstage-$(CONFIG_SUPERIO_NSC_PC87309) += superio.c
diff --git a/src/superio/nsc/pc87309/early_serial.c b/src/superio/nsc/pc87309/early_serial.c
deleted file mode 100644
index 6b1ccd2247..0000000000
--- a/src/superio/nsc/pc87309/early_serial.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
- *
- * 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_def.h>
-#include "pc87309.h"
-
-void pc87309_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/pc87309/pc87309.h b/src/superio/nsc/pc87309/pc87309.h
index dfc2de1127..3b912ea455 100644
--- a/src/superio/nsc/pc87309/pc87309.h
+++ b/src/superio/nsc/pc87309/pc87309.h
@@ -27,9 +27,4 @@
#define PC87309_KBCM 0x05 /* Mouse */
#define PC87309_KBCK 0x06 /* Keyboard */
-#include <arch/io.h>
-#include <stdint.h>
-
-void pc87309_enable_serial(pnp_devfn_t dev, u16 iobase);
-
#endif /* SUPERIO_NSC_PC87309_H */