[coreboot-gerrit] Change in ...coreboot[master]: superio/nsc/pc87309: Use common early_serial

[Peter Lemenkov (Code Review)]

Peter Lemenkov has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31334

Change subject: superio/nsc/pc87309: Use common early_serial
......................................................................

superio/nsc/pc87309: Use common early_serial

Change-Id: If856ec6d5bcf4951d0e09464526239f5a508d4b0
Signed-off-by: Peter Lemenkov 
---
M src/superio/nsc/pc87309/Kconfig
M src/superio/nsc/pc87309/Makefile.inc
D src/superio/nsc/pc87309/early_serial.c
M src/superio/nsc/pc87309/pc87309.h
4 files changed, 1 insertion(+), 34 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/31334/1

diff --git a/src/superio/nsc/pc87309/Kconfig b/src/superio/nsc/pc87309/Kconfig
index d4b841e..ff72706 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 0f0b367..6c7a8ab 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 6b1ccd2..0000000
--- 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 
- *
- * 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 dfc2de1..3b912ea 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 */