From 24d1d4b47274eb82893e6726472a991a36fce0aa Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Thu, 21 Mar 2013 11:51:41 -0700 Subject: 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 Reviewed-on: http://review.coreboot.org/2872 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- src/superio/smsc/fdc37m60x/early_serial.c | 2 +- src/superio/smsc/kbc1100/kbc1100_early_init.c | 2 +- src/superio/smsc/lpc47b272/early_serial.c | 2 +- src/superio/smsc/lpc47b397/early_serial.c | 2 +- src/superio/smsc/lpc47m10x/early_serial.c | 2 +- src/superio/smsc/lpc47m15x/early_serial.c | 2 +- src/superio/smsc/lpc47n217/early_serial.c | 2 +- src/superio/smsc/lpc47n227/early_serial.c | 2 +- src/superio/smsc/sch4037/sch4037_early_init.c | 2 +- src/superio/smsc/sio1036/sio1036_early_init.c | 2 +- src/superio/smsc/smscsuperio/early_serial.c | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/superio/smsc') diff --git a/src/superio/smsc/fdc37m60x/early_serial.c b/src/superio/smsc/fdc37m60x/early_serial.c index a3539b15d1..38cb0f8f27 100644 --- a/src/superio/smsc/fdc37m60x/early_serial.c +++ b/src/superio/smsc/fdc37m60x/early_serial.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include #include "fdc37m60x.h" /* The base address is 0x3f0 or 0x370, depending on the SYSOPT pin. */ diff --git a/src/superio/smsc/kbc1100/kbc1100_early_init.c b/src/superio/smsc/kbc1100/kbc1100_early_init.c index e12db31d0f..5d74c3230e 100644 --- a/src/superio/smsc/kbc1100/kbc1100_early_init.c +++ b/src/superio/smsc/kbc1100/kbc1100_early_init.c @@ -19,7 +19,7 @@ /* Pre-RAM driver for the SMSC KBC1100 Super I/O chip */ -#include +#include #include "kbc1100.h" static inline void pnp_enter_conf_state(device_t dev) diff --git a/src/superio/smsc/lpc47b272/early_serial.c b/src/superio/smsc/lpc47b272/early_serial.c index 54e854c65e..b2f0d1b724 100644 --- a/src/superio/smsc/lpc47b272/early_serial.c +++ b/src/superio/smsc/lpc47b272/early_serial.c @@ -20,7 +20,7 @@ /* Pre-RAM driver for SMSC LPC47B272 Super I/O chip. */ -#include +#include #include "lpc47b272.h" static void pnp_enter_conf_state(device_t dev) diff --git a/src/superio/smsc/lpc47b397/early_serial.c b/src/superio/smsc/lpc47b397/early_serial.c index 930e41a331..31d515b5c0 100644 --- a/src/superio/smsc/lpc47b397/early_serial.c +++ b/src/superio/smsc/lpc47b397/early_serial.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include #include "lpc47b397.h" static void pnp_enter_conf_state(device_t dev) diff --git a/src/superio/smsc/lpc47m10x/early_serial.c b/src/superio/smsc/lpc47m10x/early_serial.c index 99aebbc84d..fc6efb91d8 100644 --- a/src/superio/smsc/lpc47m10x/early_serial.c +++ b/src/superio/smsc/lpc47m10x/early_serial.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include #include "lpc47m10x.h" static void pnp_enter_conf_state(device_t dev) diff --git a/src/superio/smsc/lpc47m15x/early_serial.c b/src/superio/smsc/lpc47m15x/early_serial.c index bd57a28b70..7d75baecbe 100644 --- a/src/superio/smsc/lpc47m15x/early_serial.c +++ b/src/superio/smsc/lpc47m15x/early_serial.c @@ -19,7 +19,7 @@ /* Pre-RAM driver for the SMSC LPC47M15X Super I/O chip */ -#include +#include #include "lpc47m15x.h" static void pnp_enter_conf_state(device_t dev) diff --git a/src/superio/smsc/lpc47n217/early_serial.c b/src/superio/smsc/lpc47n217/early_serial.c index 6c0276970b..451628a449 100644 --- a/src/superio/smsc/lpc47n217/early_serial.c +++ b/src/superio/smsc/lpc47n217/early_serial.c @@ -20,7 +20,7 @@ /* Pre-RAM driver for SMSC LPC47N217 Super I/O chip. */ -#include +#include #include #include "lpc47n217.h" diff --git a/src/superio/smsc/lpc47n227/early_serial.c b/src/superio/smsc/lpc47n227/early_serial.c index b20bc80156..4aea7c57fc 100644 --- a/src/superio/smsc/lpc47n227/early_serial.c +++ b/src/superio/smsc/lpc47n227/early_serial.c @@ -20,7 +20,7 @@ /* Pre-RAM driver for SMSC LPC47N227 Super I/O chip. */ -#include +#include #include "lpc47n227.h" static void pnp_enter_conf_state(device_t dev) diff --git a/src/superio/smsc/sch4037/sch4037_early_init.c b/src/superio/smsc/sch4037/sch4037_early_init.c index fc9aaf5eab..dfacd24aca 100644 --- a/src/superio/smsc/sch4037/sch4037_early_init.c +++ b/src/superio/smsc/sch4037/sch4037_early_init.c @@ -18,7 +18,7 @@ */ -#include +#include #include "sch4037.h" static inline void pnp_enter_conf_state(device_t dev) diff --git a/src/superio/smsc/sio1036/sio1036_early_init.c b/src/superio/smsc/sio1036/sio1036_early_init.c index 289d83f1ab..314ea7541b 100644 --- a/src/superio/smsc/sio1036/sio1036_early_init.c +++ b/src/superio/smsc/sio1036/sio1036_early_init.c @@ -19,7 +19,7 @@ /* Pre-RAM driver for the SMSC KBC1100 Super I/O chip */ -#include +#include #include "sio1036.h" #ifndef CONFIG_TTYS0_BASE diff --git a/src/superio/smsc/smscsuperio/early_serial.c b/src/superio/smsc/smscsuperio/early_serial.c index 85f7b461c1..5e9aadb7e3 100644 --- a/src/superio/smsc/smscsuperio/early_serial.c +++ b/src/superio/smsc/smscsuperio/early_serial.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include #include /* All known/supported SMSC Super I/Os have the same logical device IDs -- cgit v1.2.3