x86: Unify arch/io.h and arch/romcc_io.h

Here's the great news: From now on you don't have to worry about
hitting the right io.h include anymore. Just forget about romcc_io.h
and use io.h instead. This cleanup has a number of advantages, like
you don't have to guard device/ includes for SMM and pre RAM
anymore. This allows to get rid of a number of ifdefs and will
generally make the code more readable and understandable.

Potentially in the future some of the code in the io.h __PRE_RAM__
path should move to device.h or other device/ includes instead,
but that's another incremental change.

Change-Id: I356f06110e2e355e9a5b4b08c132591f36fec7d9
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/2872
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>

6 files changed, 6 insertions, 6 deletions

diff --git a/src/superio/fintek/f71805f/early_serial.c b/src/superio/fintek/f71805f/early_serial.c
index e774f0c0f9..827f870a37 100644
--- a/src/superio/fintek/f71805f/early_serial.c
+++ b/src/superio/fintek/f71805f/early_serial.c
@@ -20,7 +20,7 @@
 
 /* Pre-RAM driver for the Fintek F71805F/FG Super I/O chip. */
 
-#include <arch/romcc_io.h>
+#include <arch/io.h>
 #include "f71805f.h"
 
 static void pnp_enter_conf_state(device_t dev)
diff --git a/src/superio/fintek/f71859/early_serial.c b/src/superio/fintek/f71859/early_serial.c
index 6781ad7bd8..4401714b98 100644
--- a/src/superio/fintek/f71859/early_serial.c
+++ b/src/superio/fintek/f71859/early_serial.c
@@ -20,7 +20,7 @@
 
 /* Pre-RAM driver for the Fintek F71859 Super I/O chip. */
 
-#include <arch/romcc_io.h>
+#include <arch/io.h>
 #include "f71859.h"
 
 static void pnp_enter_conf_state(device_t dev)
diff --git a/src/superio/fintek/f71863fg/early_serial.c b/src/superio/fintek/f71863fg/early_serial.c
index bf6c9ab43e..5d1cfb715e 100644
--- a/src/superio/fintek/f71863fg/early_serial.c
+++ b/src/superio/fintek/f71863fg/early_serial.c
@@ -20,7 +20,7 @@
 
 /* Pre-RAM driver for the Fintek F71863FG Super I/O chip. */
 
-#include <arch/romcc_io.h>
+#include <arch/io.h>
 #include "f71863fg.h"
 
 static void pnp_enter_conf_state(device_t dev)
diff --git a/src/superio/fintek/f71872/early_serial.c b/src/superio/fintek/f71872/early_serial.c
index 55646a4a93..af5cdb3545 100644
--- a/src/superio/fintek/f71872/early_serial.c
+++ b/src/superio/fintek/f71872/early_serial.c
@@ -20,7 +20,7 @@
 
 /* Pre-RAM driver for the Fintek F71872F/FG Super I/O chip. */
 
-#include <arch/romcc_io.h>
+#include <arch/io.h>
 #include "f71872.h"
 
 static void pnp_enter_conf_state(device_t dev)
diff --git a/src/superio/fintek/f71889/early_serial.c b/src/superio/fintek/f71889/early_serial.c
index 4548e1c01b..9623cbd2a3 100644
--- a/src/superio/fintek/f71889/early_serial.c
+++ b/src/superio/fintek/f71889/early_serial.c
@@ -19,7 +19,7 @@
  */
 
 #include <stdint.h>
-#include <arch/romcc_io.h>
+#include <arch/io.h>
 #include "f71889.h"
 
 static void pnp_enter_conf_state(device_t dev)
diff --git a/src/superio/fintek/f81865f/f81865f_early_serial.c b/src/superio/fintek/f81865f/f81865f_early_serial.c
index 80af5aaaf6..2989b5f911 100644
--- a/src/superio/fintek/f81865f/f81865f_early_serial.c
+++ b/src/superio/fintek/f81865f/f81865f_early_serial.c
@@ -20,7 +20,7 @@
 
 /* Pre-RAM driver for the Fintek F81865F/FG Super I/O chip. */
 
-#include <arch/romcc_io.h>
+#include <arch/io.h>
 #include "f81865f.h"
 
 static void pnp_enter_conf_state(device_t dev)