Add #include guards to all Super I/O header files (trivial).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6049 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

20 files changed, 91 insertions, 15 deletions

diff --git a/src/superio/smsc/fdc37m60x/chip.h b/src/superio/smsc/fdc37m60x/chip.h
index d4da77bf13..eca6422342 100644
--- a/src/superio/smsc/fdc37m60x/chip.h
+++ b/src/superio/smsc/fdc37m60x/chip.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef _SUPERIO_SMSC_FDC37M60X
-#define _SUPERIO_SMSC_FDC37M60X
+#ifndef SUPERIO_SMSC_FDC37M60X_CHIP_H
+#define SUPERIO_SMSC_FDC37M60X_CHIP_H
 
 #include <device/device.h>
 #include <pc80/keyboard.h>
@@ -32,4 +32,4 @@ struct superio_smsc_fdc37m60x_config {
 	struct pc_keyboard keyboard;
 };
 
-#endif /* _SUPERIO_SMSC_FDC37M60X */
+#endif
diff --git a/src/superio/smsc/fdc37m60x/fdc37m60x.h b/src/superio/smsc/fdc37m60x/fdc37m60x.h
index 3424faf903..22c24c73e5 100644
--- a/src/superio/smsc/fdc37m60x/fdc37m60x.h
+++ b/src/superio/smsc/fdc37m60x/fdc37m60x.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef SUPERIO_SMSC_FDC37M60X_FDC37M60X_H
+#define SUPERIO_SMSC_FDC37M60X_FDC37M60X_H
+
 /*
  * Datasheet:
  *   - Name: FDC37M60x Enhanced Super I/O Controller with Infrared Support.
@@ -36,3 +39,5 @@
 #define FDC37M60X_SP2  0x05 /* Com2 */
 #define FDC37M60X_KBCK 0x07 /* Keyboard */
 #define FDC37M60X_AUX  0x08 /* Auxiliary I/O */
+
+#endif
diff --git a/src/superio/smsc/fdc37n972/chip.h b/src/superio/smsc/fdc37n972/chip.h
index c486a7305a..0d8c18a8cb 100644
--- a/src/superio/smsc/fdc37n972/chip.h
+++ b/src/superio/smsc/fdc37n972/chip.h
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef _SUPERIO_SMSC_FDC37N972
-#define _SUPERIO_SMSC_FDC37N972
+#ifndef SUPERIO_SMSC_FDC37N972_CHIP_H
+#define SUPERIO_SMSC_FDC37N972_CHIP_H
 
 #include <device/device.h>
 #include <pc80/keyboard.h>
@@ -31,5 +31,5 @@ struct superio_smsc_fdc37n972_config {
 	struct pc_keyboard keyboard;
 };
 
-#endif /* _SUPERIO_SMSC_FDC37N972 */
+#endif
 
diff --git a/src/superio/smsc/fdc37n972/fdc37n972.h b/src/superio/smsc/fdc37n972/fdc37n972.h
index 0825fc9be2..91b3410408 100644
--- a/src/superio/smsc/fdc37n972/fdc37n972.h
+++ b/src/superio/smsc/fdc37n972/fdc37n972.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef SUPERIO_SMSC_FDC37N972_FDC37N972_H
+#define SUPERIO_SMSC_FDC37N972_FDC37N972_H
+
 #define FDC37N972_FDC  0x00 /* Floppy */
 #define FDC37N972_PP   0x03 /* Parallel port */
 #define FDC37N972_SP1  0x04 /* Serial port 1 */
@@ -26,3 +29,4 @@
 #define FDC37N972_EC   0x08 /* Environmental Controller */
 #define FDC37N972_MBX  0x09 /* Mailbox register */
 
+#endif
diff --git a/src/superio/smsc/lpc47b272/chip.h b/src/superio/smsc/lpc47b272/chip.h
index 85b4040dfc..b96063c7f7 100644
--- a/src/superio/smsc/lpc47b272/chip.h
+++ b/src/superio/smsc/lpc47b272/chip.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef SUPERIO_SMSC_LPC47B272_CHIP_H
+#define SUPERIO_SMSC_LPC47B272_CHIP_H
+
 struct chip_operations;
 extern struct chip_operations superio_smsc_lpc47b272_ops;
 
@@ -28,3 +31,5 @@ struct superio_smsc_lpc47b272_config {
 	struct uart8250 com1, com2;
 	struct pc_keyboard keyboard;
 };
+
+#endif
diff --git a/src/superio/smsc/lpc47b272/lpc47b272.h b/src/superio/smsc/lpc47b272/lpc47b272.h
index 98639de88b..cdd0fa4865 100644
--- a/src/superio/smsc/lpc47b272/lpc47b272.h
+++ b/src/superio/smsc/lpc47b272/lpc47b272.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef SUPERIO_SMSC_LPC47B272_LPC47B272_H
+#define SUPERIO_SMSC_LPC47B272_LPC47B272_H
+
 #define LPC47B272_FDC              0   /* Floppy */
 #define LPC47B272_PP               3   /* Parallel Port */
 #define LPC47B272_SP1              4   /* Com1 */
@@ -26,3 +29,5 @@
 #define LPC47B272_RT              10   /* Runtime reg*/
 
 #define LPC47B272_MAX_CONFIG_REGISTER	0x5F
+
+#endif
diff --git a/src/superio/smsc/lpc47b397/chip.h b/src/superio/smsc/lpc47b397/chip.h
index 321fd898f1..b18b6a556f 100644
--- a/src/superio/smsc/lpc47b397/chip.h
+++ b/src/superio/smsc/lpc47b397/chip.h
@@ -20,6 +20,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef SUPERIO_SMSC_LPC47B397_CHIP_H
+#define SUPERIO_SMSC_LPC47B397_CHIP_H
+
 struct chip_operations;
 extern struct chip_operations superio_smsc_lpc47b397_ops;
 
@@ -30,3 +33,5 @@ struct superio_smsc_lpc47b397_config {
 	struct uart8250 com1, com2;
 	struct pc_keyboard keyboard;
 };
+
+#endif
diff --git a/src/superio/smsc/lpc47b397/lpc47b397.h b/src/superio/smsc/lpc47b397/lpc47b397.h
index 91bad4730c..e9532d9ff4 100644
--- a/src/superio/smsc/lpc47b397/lpc47b397.h
+++ b/src/superio/smsc/lpc47b397/lpc47b397.h
@@ -20,6 +20,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef SUPERIO_SMSC_LPC47B397_LPC47B397_H
+#define SUPERIO_SMSC_LPC47B397_LPC47B397_H
+
 #define LPC47B397_FDC		0	/* Floppy */
 #define LPC47B397_PP		3	/* Parallel Port */
 #define LPC47B397_SP1		4	/* Com1 */
@@ -27,3 +30,5 @@
 #define LPC47B397_KBC		7	/* Keyboard & Mouse */
 #define LPC47B397_HWM		8	/* HW Monitor */
 #define LPC47B397_RT		10	/* Runtime reg*/
+
+#endif
diff --git a/src/superio/smsc/lpc47m10x/chip.h b/src/superio/smsc/lpc47m10x/chip.h
index abd21be926..ace92f1c2f 100644
--- a/src/superio/smsc/lpc47m10x/chip.h
+++ b/src/superio/smsc/lpc47m10x/chip.h
@@ -22,6 +22,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#ifndef SUPERIO_SMSC_LPC47M10X_CHIP_H
+#define SUPERIO_SMSC_LPC47M10X_CHIP_H
+
 struct chip_operations;
 extern struct chip_operations superio_smsc_lpc47m10x_ops;
 
@@ -32,3 +35,5 @@ struct superio_smsc_lpc47m10x_config {
 	struct uart8250 com1, com2;
 	struct pc_keyboard keyboard;
 };
+
+#endif
diff --git a/src/superio/smsc/lpc47m10x/lpc47m10x.h b/src/superio/smsc/lpc47m10x/lpc47m10x.h
index 2fd4ba76b4..604016c0e0 100644
--- a/src/superio/smsc/lpc47m10x/lpc47m10x.h
+++ b/src/superio/smsc/lpc47m10x/lpc47m10x.h
@@ -20,6 +20,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#ifndef SUPERIO_SMSC_LPC47M10X_LPC47M10X_H
+#define SUPERIO_SMSC_LPC47M10X_LPC47M10X_H
+
 #define LPC47M10X2_FDC              0   /* Floppy */
 #define LPC47M10X2_PP               3   /* Parallel Port */
 #define LPC47M10X2_SP1              4   /* Com1 */
@@ -30,3 +33,5 @@
 #define LPC47M10X2_MPU           10   /* MPE -- who knows --   reg*/
 
 #define LPC47M10X2_MAX_CONFIG_REGISTER	0x5F
+
+#endif
diff --git a/src/superio/smsc/lpc47m15x/chip.h b/src/superio/smsc/lpc47m15x/chip.h
index 199ffd694a..a4532bb454 100644
--- a/src/superio/smsc/lpc47m15x/chip.h
+++ b/src/superio/smsc/lpc47m15x/chip.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef SUPERIO_SMSC_LPC47M15X_CHIP_H
+#define SUPERIO_SMSC_LPC47M15X_CHIP_H
+
 struct chip_operations;
 extern struct chip_operations superio_smsc_lpc47m15x_ops;
 
@@ -27,3 +30,5 @@ struct superio_smsc_lpc47m15x_config {
 	struct uart8250 com1, com2;
 	struct pc_keyboard keyboard;
 };
+
+#endif
diff --git a/src/superio/smsc/lpc47m15x/lpc47m15x.h b/src/superio/smsc/lpc47m15x/lpc47m15x.h
index e469e615e5..5f62466511 100644
--- a/src/superio/smsc/lpc47m15x/lpc47m15x.h
+++ b/src/superio/smsc/lpc47m15x/lpc47m15x.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef SUPERIO_SMSC_LPC47M15X_LPC47M15X_H
+#define SUPERIO_SMSC_LPC47M15X_LPC47M15X_H
+
 #define LPC47M15X_FDC              0   /* Floppy */
 #define LPC47M15X_PP               3   /* Parallel Port */
 #define LPC47M15X_SP1              4   /* Com1 */
@@ -27,3 +30,5 @@
 #define LPC47M15X_MPU             11   /* MPE -- who knows --   reg*/
 
 #define LPC47M15X2_MAX_CONFIG_REGISTER	0x5F
+
+#endif
diff --git a/src/superio/smsc/lpc47n217/chip.h b/src/superio/smsc/lpc47n217/chip.h
index 4369c263bd..0eda25f6b1 100644
--- a/src/superio/smsc/lpc47n217/chip.h
+++ b/src/superio/smsc/lpc47n217/chip.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef SUPERIO_SMSC_LPC47N217_CHIP_H
+#define SUPERIO_SMSC_LPC47N217_CHIP_H
+
 struct chip_operations;
 extern struct chip_operations superio_smsc_lpc47n217_ops;
 
@@ -26,3 +29,5 @@ extern struct chip_operations superio_smsc_lpc47n217_ops;
 struct superio_smsc_lpc47n217_config {
 	struct uart8250 com1, com2;
 };
+
+#endif
diff --git a/src/superio/smsc/lpc47n217/lpc47n217.h b/src/superio/smsc/lpc47n217/lpc47n217.h
index 3795821129..e0ee010c35 100644
--- a/src/superio/smsc/lpc47n217/lpc47n217.h
+++ b/src/superio/smsc/lpc47n217/lpc47n217.h
@@ -18,12 +18,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-/* These are arbitrary, but must match declarations in the mainboard config file.
- * Values chosen to match SMSC 47B37x.
- */
+#ifndef SUPERIO_SMSC_LPC47N217_LPC47N217_H
+#define SUPERIO_SMSC_LPC47N217_LPC47N217_H
 
+/*
+ * These are arbitrary, but must match declarations in the mainboard
+ * devicetree.cb file. Values chosen to match SMSC LPC47B37x.
+ */
 #define LPC47N217_PP               3   /* Parallel Port */
 #define LPC47N217_SP1              4   /* Com1 */
 #define LPC47N217_SP2              5   /* Com2 */
 
 #define LPC47N217_MAX_CONFIG_REGISTER	0x39
+
+#endif
diff --git a/src/superio/smsc/lpc47n227/chip.h b/src/superio/smsc/lpc47n227/chip.h
index ef1030751e..b2d0a9218f 100644
--- a/src/superio/smsc/lpc47n227/chip.h
+++ b/src/superio/smsc/lpc47n227/chip.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef SUPERIO_SMSC_LPC47N227_CHIP_H
+#define SUPERIO_SMSC_LPC47N227_CHIP_H
+
 #include <device/device.h>
 #include <pc80/keyboard.h>
 #include <uart8250.h>
@@ -27,3 +30,5 @@ struct superio_smsc_lpc47n227_config {
 	struct uart8250 com1, com2;
 	struct pc_keyboard keyboard;
 };
+
+#endif
diff --git a/src/superio/smsc/lpc47n227/lpc47n227.h b/src/superio/smsc/lpc47n227/lpc47n227.h
index 769b5beadb..99097a497f 100644
--- a/src/superio/smsc/lpc47n227/lpc47n227.h
+++ b/src/superio/smsc/lpc47n227/lpc47n227.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef SUPERIO_SMSC_LPC47N227_LPC47N227_H
+#define SUPERIO_SMSC_LPC47N227_LPC47N227_H
+
 /*
  * Since the LPC47N227 does not have logical devices but a flat configuration
  * space, these are arbitrary, but must match declarations in the mainboard
@@ -28,3 +31,5 @@
 #define LPC47N227_KBDC             5	/* Keyboard */
 
 #define LPC47N227_MAX_CONFIG_REGISTER	0x39
+
+#endif
diff --git a/src/superio/smsc/sio10n268/chip.h b/src/superio/smsc/sio10n268/chip.h
index 7d5c4136f5..43ad168223 100644
--- a/src/superio/smsc/sio10n268/chip.h
+++ b/src/superio/smsc/sio10n268/chip.h
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef _SUPERIO_SMSC_SIO10N268
-#define _SUPERIO_SMSC_SIO10N268
+#ifndef SUPERIO_SMSC_SIO10N268_CHIP_H
+#define SUPERIO_SMSC_SIO10N268_CHIP_H
 
 #include <device/device.h>
 #include <pc80/keyboard.h>
@@ -31,5 +31,4 @@ struct superio_smsc_sio10n268_config {
 	struct pc_keyboard keyboard;
 };
 
-#endif /* _SUPERIO_SMSC_SIO10N268 */
-
+#endif
diff --git a/src/superio/smsc/sio10n268/sio10n268.h b/src/superio/smsc/sio10n268/sio10n268.h
index b3a635e0bf..3d868b0ec1 100644
--- a/src/superio/smsc/sio10n268/sio10n268.h
+++ b/src/superio/smsc/sio10n268/sio10n268.h
@@ -17,9 +17,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-// XXX the SIO10N268 has no logical devices.
+#ifndef SUPERIO_SMSC_SIO10N268_SIO10N268_H
+#define SUPERIO_SMSC_SIO10N268_SIO10N268_H
+
+/* Note: The SIO10N268 has no logical devices. */
 
 #define SIO10N268_FDC  0x00 /* Floppy */
 #define SIO10N268_PP   0x03 /* Parallel port */
 #define SIO10N268_KBDC 0x05 /* Keyboard */
 
+#endif
diff --git a/src/superio/smsc/smscsuperio/Makefile.inc b/src/superio/smsc/smscsuperio/Makefile.inc
index 209a307fb2..0dfc8d80d0 100644
--- a/src/superio/smsc/smscsuperio/Makefile.inc
+++ b/src/superio/smsc/smscsuperio/Makefile.inc
@@ -18,5 +18,4 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-#config chip.h
 ramstage-$(CONFIG_SUPERIO_SMSC_SMSCSUPERIO) += superio.c
diff --git a/src/superio/smsc/smscsuperio/chip.h b/src/superio/smsc/smscsuperio/chip.h
index 3f017e4464..1655eea102 100644
--- a/src/superio/smsc/smscsuperio/chip.h
+++ b/src/superio/smsc/smscsuperio/chip.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef SUPERIO_SMSC_SMSCSUPERIO_CHIP_H
+#define SUPERIO_SMSC_SMSCSUPERIO_CHIP_H
+
 #include <device/device.h>
 #include <pc80/keyboard.h>
 #include <uart8250.h>
@@ -28,3 +31,5 @@ struct superio_smsc_smscsuperio_config {
 	struct uart8250 com1, com2;
 	struct pc_keyboard keyboard;
 };
+
+#endif