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>
This commit is contained in:
Stefan Reinauer
2013-03-21 11:51:41 -07:00
committed by Stefan Reinauer
parent 55ed310655
commit 24d1d4b472
410 changed files with 529 additions and 876 deletions

View File

@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <arch/romcc_io.h>
#include <arch/io.h>
#include "fdc37m60x.h"
/* The base address is 0x3f0 or 0x370, depending on the SYSOPT pin. */

View File

@@ -19,7 +19,7 @@
/* Pre-RAM driver for the SMSC KBC1100 Super I/O chip */
#include <arch/romcc_io.h>
#include <arch/io.h>
#include "kbc1100.h"
static inline void pnp_enter_conf_state(device_t dev)

View File

@@ -20,7 +20,7 @@
/* Pre-RAM driver for SMSC LPC47B272 Super I/O chip. */
#include <arch/romcc_io.h>
#include <arch/io.h>
#include "lpc47b272.h"
static void pnp_enter_conf_state(device_t dev)

View File

@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <arch/romcc_io.h>
#include <arch/io.h>
#include "lpc47b397.h"
static void pnp_enter_conf_state(device_t dev)

View File

@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <arch/romcc_io.h>
#include <arch/io.h>
#include "lpc47m10x.h"
static void pnp_enter_conf_state(device_t dev)

View File

@@ -19,7 +19,7 @@
/* Pre-RAM driver for the SMSC LPC47M15X Super I/O chip */
#include <arch/romcc_io.h>
#include <arch/io.h>
#include "lpc47m15x.h"
static void pnp_enter_conf_state(device_t dev)

View File

@@ -20,7 +20,7 @@
/* Pre-RAM driver for SMSC LPC47N217 Super I/O chip. */
#include <arch/romcc_io.h>
#include <arch/io.h>
#include <assert.h>
#include "lpc47n217.h"

View File

@@ -20,7 +20,7 @@
/* Pre-RAM driver for SMSC LPC47N227 Super I/O chip. */
#include <arch/romcc_io.h>
#include <arch/io.h>
#include "lpc47n227.h"
static void pnp_enter_conf_state(device_t dev)

View File

@@ -18,7 +18,7 @@
*/
#include <arch/romcc_io.h>
#include <arch/io.h>
#include "sch4037.h"
static inline void pnp_enter_conf_state(device_t dev)

View File

@@ -19,7 +19,7 @@
/* Pre-RAM driver for the SMSC KBC1100 Super I/O chip */
#include <arch/romcc_io.h>
#include <arch/io.h>
#include "sio1036.h"
#ifndef CONFIG_TTYS0_BASE

View File

@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <arch/romcc_io.h>
#include <arch/io.h>
#include <device/pnp_def.h>
/* All known/supported SMSC Super I/Os have the same logical device IDs