Patch set updated for coreboot: bd6d2dd mainboards: Add missing header guards - coreboot-gerrit

4 Aug 2014

HAOUAS Elyes (ehaouas@noos.fr) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6489
-gerrit
commit bd6d2dd4d44f7bb59952f29f675775d88e79a143
Author: Elyes HAOUAS ehaouas@noos.fr
Date:   Mon Aug 4 09:19:27 2014 +0200
mainboards: Add missing header guards
Change-Id: If93f5663fce9cc9b1675badcbf9f88525d875e76
    Signed-off-by: Elyes HAOUAS ehaouas@noos.fr
---
 src/mainboard/amd/torpedo/Oem.h                 | 6 ++++++
 src/mainboard/asus/m2n-e/hda_verb.h             | 5 +++++
 src/mainboard/dmp/vortex86ex/hda_verb.h         | 5 +++++
 src/mainboard/getac/p470/hda_verb.h             | 5 +++++
 src/mainboard/google/bolt/hda_verb.h            | 5 +++++
 src/mainboard/google/butterfly/hda_verb.h       | 4 ++++
 src/mainboard/google/falco/hda_verb.h           | 5 +++++
 src/mainboard/google/link/hda_verb.h            | 5 +++++
 src/mainboard/google/link/i915io.h              | 5 +++++
 src/mainboard/google/parrot/hda_verb.h          | 5 +++++
 src/mainboard/google/peppy/hda_verb.h           | 5 +++++
 src/mainboard/google/slippy/hda_verb.h          | 5 +++++
 src/mainboard/google/stout/hda_verb.h           | 5 +++++
 src/mainboard/intel/baskingridge/hda_verb.h     | 5 +++++
 src/mainboard/intel/cougar_canyon2/hda_verb.h   | 5 +++++
 src/mainboard/intel/eagleheights/ioapic.h       | 5 +++++
 src/mainboard/intel/emeraldlake2/hda_verb.h     | 5 +++++
 src/mainboard/intel/wtm2/hda_verb.h             | 5 +++++
 src/mainboard/intel/xe7501devkit/ioapic.h       | 5 +++++
 src/mainboard/iwave/iWRainbowG6/hda_verb.h      | 5 +++++
 src/mainboard/kontron/ktqm77/hda_verb.h         | 6 ++++++
 src/mainboard/lenovo/t520/hda_verb.h            | 4 ++++
 src/mainboard/lenovo/t530/hda_verb.h            | 4 ++++
 src/mainboard/lenovo/x201/hda_verb.h            | 5 +++++
 src/mainboard/lenovo/x230/hda_verb.h            | 4 ++++
 src/mainboard/lenovo/x60/i915io.h               | 5 +++++
 src/mainboard/nvidia/l1_2pvv/hda_verb.h         | 5 +++++
 src/mainboard/packardbell/ms2290/hda_verb.h     | 5 +++++
 src/mainboard/roda/rk9/hda_verb.h               | 5 +++++
 src/mainboard/samsung/lumpy/hda_verb.h          | 5 +++++
 src/mainboard/samsung/stumpy/hda_verb.h         | 5 +++++
 src/mainboard/technexion/tim5690/speaker.h      | 5 +++++
 src/mainboard/technexion/tim5690/tn_post_code.h | 6 +++++-
 src/mainboard/technexion/tim5690/vgabios.h      | 5 +++++
 34 files changed, 168 insertions(+), 1 deletion(-)

diff --git a/src/mainboard/amd/torpedo/Oem.h b/src/mainboard/amd/torpedo/Oem.h
index 915182e..0be9abe 100644
--- a/src/mainboard/amd/torpedo/Oem.h
+++ b/src/mainboard/amd/torpedo/Oem.h
@@ -16,6 +16,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#ifndef MAINBOARD_AMD_TORPEDO_OEM_H
+#define MAINBOARD_AMD_TORPEDO_OEM_H
+
 #ifndef BIOS_SIZE
    #define BIOS_SIZE                      0x04   //04 - 1MB
 #endif
@@ -221,3 +225,5 @@
  *
  */
 #define PCIB_SSID                    0x780F1022
+
+#endif /* MAINBOARD_AMD_TORPEDO_OEM_H */
diff --git a/src/mainboard/asus/m2n-e/hda_verb.h b/src/mainboard/asus/m2n-e/hda_verb.h
index ec288ba..1ae213c 100644
--- a/src/mainboard/asus/m2n-e/hda_verb.h
+++ b/src/mainboard/asus/m2n-e/hda_verb.h
@@ -24,6 +24,9 @@
  * http://www.analog.com/static/imported-files/data_sheets/AD1988A_1988B.pdf
  */
+#ifndef MAINBOARD_ASUS_M2N_E_HDA_VERB_H
+#define MAINBOARD_ASUS_M2N_E_HDA_VERB_H
+
 static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
    0x11d4198b,	/* Codec Vendor / Device ID: Analog Devices AD1988B */
@@ -120,3 +123,5 @@ static const u32 mainboard_cim_verb_data[] = {
extern const u32 *cim_verb_data;
 extern u32 cim_verb_data_size;
+
+#endif /* MAINBOARD_ASUS_M2N_E_HDA_VERB_H */
diff --git a/src/mainboard/dmp/vortex86ex/hda_verb.h b/src/mainboard/dmp/vortex86ex/hda_verb.h
index 0556315..67b1e12 100644
--- a/src/mainboard/dmp/vortex86ex/hda_verb.h
+++ b/src/mainboard/dmp/vortex86ex/hda_verb.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_DMP_VORTEX86EX_HDA_VERB_H
+#define MAINBOARD_DMP_VORTEX86EX_HDA_VERB_H
+
 static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
    0x10ec0262,     // Codec Vendor / Device ID: Realtek ALC262
@@ -105,3 +108,5 @@ static const u32 mainboard_cim_verb_data[] = {
extern const u32 *cim_verb_data;
 extern u32 cim_verb_data_size;
+
+#endif /* MAINBOARD_DMP_VORTEX86EX_HDA_VERB_H */
diff --git a/src/mainboard/getac/p470/hda_verb.h b/src/mainboard/getac/p470/hda_verb.h
index b7578cc..52d16ba 100644
--- a/src/mainboard/getac/p470/hda_verb.h
+++ b/src/mainboard/getac/p470/hda_verb.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_GETAC_P470_HDA_VERB_H
+#define MAINBOARD_GETAC_P470_HDA_VERB_H
+
 static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
    0x10ec0262,	// Codec Vendor / Device ID: Realtek ALC262
@@ -106,3 +109,5 @@ static const u32 mainboard_cim_verb_data[] = {
extern const u32 *cim_verb_data;
 extern u32 cim_verb_data_size;
+
+#endif /* MAINBOARD_GETAC_P470_HDA_VERB_H */
diff --git a/src/mainboard/google/bolt/hda_verb.h b/src/mainboard/google/bolt/hda_verb.h
index f27480d..653c777 100644
--- a/src/mainboard/google/bolt/hda_verb.h
+++ b/src/mainboard/google/bolt/hda_verb.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_GOOGLE_BOLT_HDA_VERB_H
+#define MAINBOARD_GOOGLE_BOLT_HDA_VERB_H
+
 static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
    0x10ec0283,	// Codec Vendor / Device ID: Realtek ALC283
@@ -92,3 +95,5 @@ static const u32 mainboard_cim_verb_data[] = {
    0x02171f03, // connector, left panel
};
+
+#endif /* MAINBOARD_GOOGLE_BOLT_HDA_VERB_H */
diff --git a/src/mainboard/google/butterfly/hda_verb.h b/src/mainboard/google/butterfly/hda_verb.h
index 89a81fe..759153b 100644
--- a/src/mainboard/google/butterfly/hda_verb.h
+++ b/src/mainboard/google/butterfly/hda_verb.h
@@ -23,6 +23,8 @@
  *	Revision ID    : 0x100303
  */
+#ifndef MAINBOARD_GOOGLE_BUTTERFLY_HDA_VERB_H
+#define MAINBOARD_GOOGLE_BUTTERFLY_HDA_VERB_H
static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
@@ -262,3 +264,5 @@ static const u32 mainboard_pc_beep_verbs[] = {
static const u32 mainboard_pc_beep_verbs_size =
    ARRAY_SIZE(mainboard_pc_beep_verbs);
+
+#endif /* MAINBOARD_GOOGLE_BUTTERFLY_HDA_VERB_H */
diff --git a/src/mainboard/google/falco/hda_verb.h b/src/mainboard/google/falco/hda_verb.h
index f27480d..d1039ec 100644
--- a/src/mainboard/google/falco/hda_verb.h
+++ b/src/mainboard/google/falco/hda_verb.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_GOOGLE_FALCO_HDA_VERB_H
+#define MAINBOARD_GOOGLE_FALCO_HDA_VERB_H
+
 static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
    0x10ec0283,	// Codec Vendor / Device ID: Realtek ALC283
@@ -92,3 +95,5 @@ static const u32 mainboard_cim_verb_data[] = {
    0x02171f03, // connector, left panel
};
+
+#endif /* MAINBOARD_GOOGLE_FALCO_HDA_VERB_H */
diff --git a/src/mainboard/google/link/hda_verb.h b/src/mainboard/google/link/hda_verb.h
index ed18d63..4a6ba76 100644
--- a/src/mainboard/google/link/hda_verb.h
+++ b/src/mainboard/google/link/hda_verb.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_GOOGLE_LINK_HDA_VERB_H
+#define MAINBOARD_GOOGLE_LINK_HDA_VERB_H
+
 static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
    0x11020011,	// Codec Vendor / Device ID: Creative CA0132
@@ -179,3 +182,5 @@ static const u32 mainboard_pc_beep_verbs[] = {
 };
 static const u32 mainboard_pc_beep_verbs_size =
    ARRAY_SIZE(mainboard_pc_beep_verbs);
+
+#endif /* MAINBOARD_GOOGLE_LINK_HDA_VERB_H */
diff --git a/src/mainboard/google/link/i915io.h b/src/mainboard/google/link/i915io.h
index 6533c81..533bf14 100644
--- a/src/mainboard/google/link/i915io.h
+++ b/src/mainboard/google/link/i915io.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_GOOGLE_LINK_I915IO_H
+#define MAINBOARD_GOOGLE_LINK_I915IO_H
+
 #include "i915_reg.h"
 #include "drm_dp_helper.h"
@@ -84,3 +87,5 @@ u32 pack_aux(u32 *src, int src_bytes);
 void unpack_aux(u32 src, u32 *dst, int dst_bytes);
 int intel_dp_aux_ch(u32 ch_ctl, u32 ch_data, u32 *send, int send_bytes,
    u32 *recv, int recv_size);
+
+#endif /* MAINBOARD_GOOGLE_LINK_I915IO_H */
diff --git a/src/mainboard/google/parrot/hda_verb.h b/src/mainboard/google/parrot/hda_verb.h
index ca68ad3..0bbb01d 100644
--- a/src/mainboard/google/parrot/hda_verb.h
+++ b/src/mainboard/google/parrot/hda_verb.h
@@ -32,6 +32,9 @@
  *  HDMI PatherPoint
  */
+#ifndef MAINBOARD_GOOGLE_PARROT_HDA_VERB_H
+#define MAINBOARD_GOOGLE_PARROT_HDA_VERB_H
+
 static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
    0x10ec0269,	// Codec Vendor / Device ID: Realtek ALC269
@@ -167,3 +170,5 @@ static const u32 mainboard_pc_beep_verbs[] = {
static const u32 mainboard_pc_beep_verbs_size =
    ARRAY_SIZE(mainboard_pc_beep_verbs);
+
+#endif /* MAINBOARD_GOOGLE_PARROT_HDA_VERB_H */
diff --git a/src/mainboard/google/peppy/hda_verb.h b/src/mainboard/google/peppy/hda_verb.h
index d3a63bf..adadf88 100644
--- a/src/mainboard/google/peppy/hda_verb.h
+++ b/src/mainboard/google/peppy/hda_verb.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_GOOGLE_PEPPY_HDA_VERB_H
+#define MAINBOARD_GOOGLE_PEPPY_HDA_VERB_H
+
 static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
    0x10ec0283,	// Codec Vendor / Device ID: Realtek ALC283
@@ -97,3 +100,5 @@ static const u32 mainboard_cim_verb_data[] = {
    0x02171f03, // connector, left panel
};
+
+#endif /* MAINBOARD_GOOGLE_PEPPY_HDA_VERB_H */
diff --git a/src/mainboard/google/slippy/hda_verb.h b/src/mainboard/google/slippy/hda_verb.h
index f27480d..c6351e1 100644
--- a/src/mainboard/google/slippy/hda_verb.h
+++ b/src/mainboard/google/slippy/hda_verb.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_GOOGLE_SLIPPY_HDA_VERB_H
+#define MAINBOARD_GOOGLE_SLIPPY_HDA_VERB_H
+
 static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
    0x10ec0283,	// Codec Vendor / Device ID: Realtek ALC283
@@ -92,3 +95,5 @@ static const u32 mainboard_cim_verb_data[] = {
    0x02171f03, // connector, left panel
};
+
+#endif /* MAINBOARD_GOOGLE_SLIPPY_HDA_VERB_H */
diff --git a/src/mainboard/google/stout/hda_verb.h b/src/mainboard/google/stout/hda_verb.h
index 08fc10c..2bd99c0 100644
--- a/src/mainboard/google/stout/hda_verb.h
+++ b/src/mainboard/google/stout/hda_verb.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_GOOGLE_STOUT_HDA_VERB_H
+#define MAINBOARD_GOOGLE_STOUT_HDA_VERB_H
+
 static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
    0x10ec0269,	// Codec Vendor / Device ID: Realtek
@@ -137,3 +140,5 @@ static const u32 mainboard_pc_beep_verbs[] = {
 };
 static const u32 mainboard_pc_beep_verbs_size =
    ARRAY_SIZE(mainboard_pc_beep_verbs);
+
+#endif /* MAINBOARD_GOOGLE_STOUT_HDA_VERB_H */
diff --git a/src/mainboard/intel/baskingridge/hda_verb.h b/src/mainboard/intel/baskingridge/hda_verb.h
index 52e5a3d..86a7434 100644
--- a/src/mainboard/intel/baskingridge/hda_verb.h
+++ b/src/mainboard/intel/baskingridge/hda_verb.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_INTEL_BASKINGRIDGE_HDA_VERB_H
+#define MAINBOARD_INTEL_BASKINGRIDGE_HDA_VERB_H
+
 static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
    0x10134210,	// Codec Vendor / Device ID: Cirrus Logic CS4210
@@ -96,3 +99,5 @@ static const u32 mainboard_cim_verb_data[] = {
    0x30771e56,
    0x30771f18
 };
+
+#endif /* MAINBOARD_INTEL_BASKINGRIDGE_HDA_VERB_H */
diff --git a/src/mainboard/intel/cougar_canyon2/hda_verb.h b/src/mainboard/intel/cougar_canyon2/hda_verb.h
index f8e83b4..f844e60 100644
--- a/src/mainboard/intel/cougar_canyon2/hda_verb.h
+++ b/src/mainboard/intel/cougar_canyon2/hda_verb.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_INTEL_COUGAR_CANYON2_HDA_VERB_H
+#define MAINBOARD_INTEL_COUGAR_CANYON2_HDA_VERB_H
+
 static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
    0x80862805,	// Codec Vendor / Device ID: Intel CougarPoint HDMI
@@ -47,3 +50,5 @@ static const u32 mainboard_cim_verb_data[] = {
    0x30771e56,
    0x30771f18
 };
+
+#endif /* MAINBOARD_INTEL_COUGAR_CANYON2_HDA_VERB_H */
diff --git a/src/mainboard/intel/eagleheights/ioapic.h b/src/mainboard/intel/eagleheights/ioapic.h
index 4ac7d62..c0d173d 100644
--- a/src/mainboard/intel/eagleheights/ioapic.h
+++ b/src/mainboard/intel/eagleheights/ioapic.h
@@ -1,2 +1,7 @@
+#ifndef MAINBOARD_INTEL_EAGLEHEIGHTS_IOAPIC_H
+#define MAINBOARD_INTEL_EAGLEHEIGHTS_IOAPIC_H
+
 #define IOAPIC_I3100 2
 #define INTEL_IOAPIC_NUM_INTERRUPTS 24
+
+#endif /* MAINBOARD_INTEL_EAGLEHEIGHTS_IOAPIC_H */
diff --git a/src/mainboard/intel/emeraldlake2/hda_verb.h b/src/mainboard/intel/emeraldlake2/hda_verb.h
index 52e5a3d..41c03c5 100644
--- a/src/mainboard/intel/emeraldlake2/hda_verb.h
+++ b/src/mainboard/intel/emeraldlake2/hda_verb.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_INTEL_EMERALDLAKE2_HDA_VERB_H
+#define MAINBOARD_INTEL_EMERALDLAKE2_HDA_VERB_H
+
 static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
    0x10134210,	// Codec Vendor / Device ID: Cirrus Logic CS4210
@@ -96,3 +99,5 @@ static const u32 mainboard_cim_verb_data[] = {
    0x30771e56,
    0x30771f18
 };
+
+#endif /* MAINBOARD_INTEL_EMERALDLAKE2_HDA_VERB_H */
diff --git a/src/mainboard/intel/wtm2/hda_verb.h b/src/mainboard/intel/wtm2/hda_verb.h
index cb33add..0505e92 100644
--- a/src/mainboard/intel/wtm2/hda_verb.h
+++ b/src/mainboard/intel/wtm2/hda_verb.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_INTEL_WTM2_HDA_VERB_H
+#define MAINBOARD_INTEL_WTM2_HDA_VERB_H
+
 static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
    0x10134210,	// Codec Vendor / Device ID: Cirrus Logic CS4210
@@ -96,3 +99,5 @@ static const u32 mainboard_cim_verb_data[] = {
    0x30771e56,
    0x30771f18
 };
+
+#endif /* MAINBOARD_INTEL_WTM2_HDA_VERB_H */
diff --git a/src/mainboard/intel/xe7501devkit/ioapic.h b/src/mainboard/intel/xe7501devkit/ioapic.h
index 9ac2aee..9cdd4a7 100644
--- a/src/mainboard/intel/xe7501devkit/ioapic.h
+++ b/src/mainboard/intel/xe7501devkit/ioapic.h
@@ -1,3 +1,6 @@
+#ifndef MAINBOARD_INTEL_XE7501DEVKIT_IOAPIC_H
+#define MAINBOARD_INTEL_XE7501DEVKIT_IOAPIC_H
+
 // IOAPIC addresses determined by coreboot enumeration.
 // Someday add functions to get APIC IDs and versions from the chips themselves.
@@ -9,3 +12,5 @@
#define P64H2_IOAPIC_VERSION	0x20
 #define INTEL_IOAPIC_NUM_INTERRUPTS 24		// Both ICH-3 and P64-H2
+
+#endif /* MAINBOARD_INTEL_XE7501DEVKIT_IOAPIC_H */
diff --git a/src/mainboard/iwave/iWRainbowG6/hda_verb.h b/src/mainboard/iwave/iWRainbowG6/hda_verb.h
index 80ed21d..c1c4f4a 100644
--- a/src/mainboard/iwave/iWRainbowG6/hda_verb.h
+++ b/src/mainboard/iwave/iWRainbowG6/hda_verb.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_IWAVE_IWRAINBOWG6_HDA_VERB_H
+#define MAINBOARD_IWAVE_IWRAINBOWG6_HDA_VERB_H
+
 static u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
    0x111d76d5,		// Codec Vendor / Device ID: IDT 92HD81
@@ -92,3 +95,5 @@ static u32 mainboard_cim_verb_data[] = {
extern const u32 *cim_verb_data;
 extern u32 cim_verb_data_size;
+
+#endif /* MAINBOARD_IWAVE_IWRAINBOWG6_HDA_VERB_H */
diff --git a/src/mainboard/kontron/ktqm77/hda_verb.h b/src/mainboard/kontron/ktqm77/hda_verb.h
index 53b3fc9..fde7f6c 100644
--- a/src/mainboard/kontron/ktqm77/hda_verb.h
+++ b/src/mainboard/kontron/ktqm77/hda_verb.h
@@ -24,6 +24,10 @@
  * Port-Con.  Location  Def.-Dev.  Con.-Type   Color    Misc  Def.-Aso.     Seq
  *    31..30    29..24     23..20     19..16  15..12  11..00     07..04  03..00
  */
+
+#ifndef MAINBOARD_KONTRON_KTQM77_HDA_VERB_H
+#define MAINBOARD_KONTRON_KTQM77_HDA_VERB_H
+
 #define PIN_CFG(pin, val) \
    (pin << 20) | ( 0x71c << 8) | (val & 0xff), \
    (pin << 20) | ( 0x71d << 8) | ((val >> 8) & 0xff), \
@@ -140,3 +144,5 @@ static const u32 mainboard_cim_verb_data[] = {
    0x30771e56,
    0x30771f18
 };
+
+#endif /* MAINBOARD_KONTRON_KTQM77_HDA_VERB_H */
diff --git a/src/mainboard/lenovo/t520/hda_verb.h b/src/mainboard/lenovo/t520/hda_verb.h
index 7d5e75a..a841423 100644
--- a/src/mainboard/lenovo/t520/hda_verb.h
+++ b/src/mainboard/lenovo/t520/hda_verb.h
@@ -24,6 +24,8 @@
  *	Revision ID    : 0x100303
  */
+#ifndef MAINBOARD_LENOVO_T520_HDA_VERB_H
+#define MAINBOARD_LENOVO_T520_HDA_VERB_H
static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
@@ -313,3 +315,5 @@ static const u32 mainboard_pc_beep_verbs[] = {
static const u32 mainboard_pc_beep_verbs_size =
    ARRAY_SIZE(mainboard_pc_beep_verbs);
+
+#endif /* MAINBOARD_LENOVO_T520_HDA_VERB_H */
diff --git a/src/mainboard/lenovo/t530/hda_verb.h b/src/mainboard/lenovo/t530/hda_verb.h
index cc280a1..6ebf2a0 100644
--- a/src/mainboard/lenovo/t530/hda_verb.h
+++ b/src/mainboard/lenovo/t530/hda_verb.h
@@ -24,6 +24,8 @@
  *	Revision ID    : 0x100303
  */
+#ifndef MAINBOARD_LENOVO_T530_HDA_VERB_H
+#define MAINBOARD_LENOVO_T530_HDA_VERB_H
static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
@@ -313,3 +315,5 @@ static const u32 mainboard_pc_beep_verbs[] = {
static const u32 mainboard_pc_beep_verbs_size =
    ARRAY_SIZE(mainboard_pc_beep_verbs);
+
+#endif /* MAINBOARD_LENOVO_T530_HDA_VERB_H */
diff --git a/src/mainboard/lenovo/x201/hda_verb.h b/src/mainboard/lenovo/x201/hda_verb.h
index d5a8e7c..db10142 100644
--- a/src/mainboard/lenovo/x201/hda_verb.h
+++ b/src/mainboard/lenovo/x201/hda_verb.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_LENOVO_X201_HDA_VERB_H
+#define MAINBOARD_LENOVO_X201_HDA_VERB_H
+
 static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
    0x14F15069,	/* Codec Vendor / Device ID: Conexant CX20585 */
@@ -118,3 +121,5 @@ static const u32 mainboard_cim_verb_data[] = {
    0x30671E56,
    0x30671F58,
 };
+
+#endif /* MAINBOARD_LENOVO_X201_HDA_VERB_H */
diff --git a/src/mainboard/lenovo/x230/hda_verb.h b/src/mainboard/lenovo/x230/hda_verb.h
index cc280a1..fdb0924 100644
--- a/src/mainboard/lenovo/x230/hda_verb.h
+++ b/src/mainboard/lenovo/x230/hda_verb.h
@@ -24,6 +24,8 @@
  *	Revision ID    : 0x100303
  */
+#ifndef MAINBOARD_LENOVO_X230_HDA_VERB_H
+#define MAINBOARD_LENOVO_X230_HDA_VERB_H
static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
@@ -313,3 +315,5 @@ static const u32 mainboard_pc_beep_verbs[] = {
static const u32 mainboard_pc_beep_verbs_size =
    ARRAY_SIZE(mainboard_pc_beep_verbs);
+
+#endif /* MAINBOARD_LENOVO_X230_HDA_VERB_H */
diff --git a/src/mainboard/lenovo/x60/i915io.h b/src/mainboard/lenovo/x60/i915io.h
index 8f37d9b..9ad4fb1 100644
--- a/src/mainboard/lenovo/x60/i915io.h
+++ b/src/mainboard/lenovo/x60/i915io.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_LENOVO_X60_I915IO_H
+#define MAINBOARD_LENOVO_X60_I915IO_H
+
 #include "i915_reg.h"
 #include "drm_dp_helper.h"
@@ -84,3 +87,5 @@ u32 pack_aux(u32 *src, int src_bytes);
 void unpack_aux(u32 src, u32 *dst, int dst_bytes);
 int intel_dp_aux_ch(u32 ch_ctl, u32 ch_data, u32 *send, int send_bytes,
    u32 *recv, int recv_size);
+
+#endif /* MAINBOARD_LENOVO_X60_I915IO_H */
diff --git a/src/mainboard/nvidia/l1_2pvv/hda_verb.h b/src/mainboard/nvidia/l1_2pvv/hda_verb.h
index 763840b..398dc97 100644
--- a/src/mainboard/nvidia/l1_2pvv/hda_verb.h
+++ b/src/mainboard/nvidia/l1_2pvv/hda_verb.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_NVIDIA_L1_2PVV_HDA_VERB_H
+#define MAINBOARD_NVIDIA_L1_2PVV_HDA_VERB_H
+
 static u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
    0x10ec0880,	// Codec Vendor / Device ID: Realtek ALC880
@@ -106,3 +109,5 @@ static u32 mainboard_cim_verb_data[] = {
extern u32 *cim_verb_data;
 extern u32 cim_verb_data_size;
+
+#endif /* MAINBOARD_NVIDIA_L1_2PVV_HDA_VERB_H */
diff --git a/src/mainboard/packardbell/ms2290/hda_verb.h b/src/mainboard/packardbell/ms2290/hda_verb.h
index 1e3ccc4..7cc4ddf 100644
--- a/src/mainboard/packardbell/ms2290/hda_verb.h
+++ b/src/mainboard/packardbell/ms2290/hda_verb.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_PACKARDBELL_MS2290_HDA_VERB_H
+#define MAINBOARD_PACKARDBELL_MS2290_HDA_VERB_H
+
 static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
    0x10ec0272,	/* Codec Vendor / Device ID: Realtek ALC272X */
@@ -88,3 +91,5 @@ static const u32 mainboard_cim_verb_data[] = {
    0x30671E56,
    0x30671F58,
 };
+
+#endif /* MAINBOARD_PACKARDBELL_MS2290_HDA_VERB_H */
diff --git a/src/mainboard/roda/rk9/hda_verb.h b/src/mainboard/roda/rk9/hda_verb.h
index f99d097..598e141 100644
--- a/src/mainboard/roda/rk9/hda_verb.h
+++ b/src/mainboard/roda/rk9/hda_verb.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_RODA_RK9_HDA_VERB_H
+#define MAINBOARD_RODA_RK9_HDA_VERB_H
+
 #define PIN_CFG(pin, val) \
    (pin << 20) | ( 0x71c << 8) | (val & 0xff), \
    (pin << 20) | ( 0x71d << 8) | ((val >> 8) & 0xff), \
@@ -72,3 +75,5 @@ static const u32 mainboard_pc_beep_verbs[] = {
 };
 extern const u32 * pc_beep_verbs;
 extern u32 pc_beep_verbs_size;
+
+#endif /* MAINBOARD_RODA_RK9_HDA_VERB_H */
diff --git a/src/mainboard/samsung/lumpy/hda_verb.h b/src/mainboard/samsung/lumpy/hda_verb.h
index dfadf55..03f8c0a 100644
--- a/src/mainboard/samsung/lumpy/hda_verb.h
+++ b/src/mainboard/samsung/lumpy/hda_verb.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_SAMSUNG_LUMPY_HDA_VERB_H
+#define MAINBOARD_SAMSUNG_LUMPY_HDA_VERB_H
+
 static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
    0x10134210,	// Codec Vendor / Device ID: Realtek ALC262
@@ -79,3 +82,5 @@ static const u32 mainboard_pc_beep_verbs[] = {
 };
 static const u32 mainboard_pc_beep_verbs_size =
    ARRAY_SIZE(mainboard_pc_beep_verbs);
+
+#endif /* MAINBOARD_SAMSUNG_LUMPY_HDA_VERB_H */
diff --git a/src/mainboard/samsung/stumpy/hda_verb.h b/src/mainboard/samsung/stumpy/hda_verb.h
index b263fbe..851516f 100644
--- a/src/mainboard/samsung/stumpy/hda_verb.h
+++ b/src/mainboard/samsung/stumpy/hda_verb.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_SAMSUNG_STUMPY_HDA_VERB_H
+#define MAINBOARD_SAMSUNG_STUMPY_HDA_VERB_H
+
 static const u32 mainboard_cim_verb_data[] = {
    /* coreboot specific header */
    0x10134210,	// Codec Vendor / Device ID: Cirrus Logic CS4210
@@ -106,3 +109,5 @@ static const u32 mainboard_pc_beep_verbs[] = {
 };
 static const u32 mainboard_pc_beep_verbs_size =
    ARRAY_SIZE(mainboard_pc_beep_verbs);
+
+#endif /* MAINBOARD_SAMSUNG_STUMPY_HDA_VERB_H */
diff --git a/src/mainboard/technexion/tim5690/speaker.h b/src/mainboard/technexion/tim5690/speaker.h
index e4a5fd0..6bee5f5 100644
--- a/src/mainboard/technexion/tim5690/speaker.h
+++ b/src/mainboard/technexion/tim5690/speaker.h
@@ -18,8 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_TECHNEXION_TIM5690_SPEAKER_H
+#define MAINBOARD_TECHNEXION_TIM5690_SPEAKER_H
+
 void speaker_init(uint8_t time);
 void speaker_on_nodelay(void);
 void speaker_off_nodelay(void);
 void speaker_on_delay(void);
 void speaker_off_delay(void);
+
+#endif /* MAINBOARD_TECHNEXION_TIM5690_SPEAKER_H */
diff --git a/src/mainboard/technexion/tim5690/tn_post_code.h b/src/mainboard/technexion/tim5690/tn_post_code.h
index 46d7382..a6ae304 100644
--- a/src/mainboard/technexion/tim5690/tn_post_code.h
+++ b/src/mainboard/technexion/tim5690/tn_post_code.h
@@ -18,11 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_TECHNEXION_TIM5690_TN_POST_CODE_H
+#define MAINBOARD_TECHNEXION_TIM5690_TN_POST_CODE_H
+
 #define LED_MESSAGE_START       0xFF
 #define LED_MESSAGE_FINISH      0x99
 #define LED_MESSAGE_RAM         0x01
-
 #ifdef __PRE_RAM__
// TechNexion's Post Code Initially.
@@ -31,3 +33,5 @@ void technexion_post_code_init(void);
 #endif
void technexion_post_code(uint8_t udata8);
+
+#endif /* MAINBOARD_TECHNEXION_TIM5690_TN_POST_CODE_H */
diff --git a/src/mainboard/technexion/tim5690/vgabios.h b/src/mainboard/technexion/tim5690/vgabios.h
index a353011..55b5b46 100644
--- a/src/mainboard/technexion/tim5690/vgabios.h
+++ b/src/mainboard/technexion/tim5690/vgabios.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#ifndef MAINBOARD_TECHNEXION_TIM5690_VGABIOS_H
+#define MAINBOARD_TECHNEXION_TIM5690_VGABIOS_H
+
 /* AMD Chipset */
 #define AMD_RS690_INT15 0x4E08
@@ -35,3 +38,5 @@ typedef struct __rs690_vbios_regs__
/* Initialization VBIOS function */
 extern void vgabios_init(rs690_vbios_regs *vbios_regs);
+
+#endif /* MAINBOARD_TECHNEXION_TIM5690_VGABIOS_H */

    