From bdcccc0b88bc10e299468e317d24a78367536fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Sun, 28 Jun 2020 16:54:45 +0300
Subject: [PATCH] sb/intel: Add include guards on nvs.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I110974f3161f2991536df50acdfe32f68bd2cc60
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42850
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/southbridge/intel/bd82x6x/nvs.h   | 5 +++++
 src/southbridge/intel/i82801dx/nvs.h  | 7 +++++++
 src/southbridge/intel/ibexpeak/nvs.h  | 6 ++++++
 src/southbridge/intel/lynxpoint/nvs.h | 5 +++++
 4 files changed, 23 insertions(+)

diff --git a/src/southbridge/intel/bd82x6x/nvs.h b/src/southbridge/intel/bd82x6x/nvs.h
index ae3304ee8e..b75e0ab025 100644
--- a/src/southbridge/intel/bd82x6x/nvs.h
+++ b/src/southbridge/intel/bd82x6x/nvs.h
@@ -1,5 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#ifndef SOUTHBRIDGE_INTEL_BD82X6X_NVS_H
+#define SOUTHBRIDGE_INTEL_BD82X6X_NVS_H
+
 #include <commonlib/helpers.h>
 #include <stdint.h>
 #include "vendorcode/google/chromeos/gnvs.h"
@@ -105,3 +108,5 @@ struct __packed global_nvs {
 };
 
 check_member(global_nvs, chromeos, GNVS_CHROMEOS_ACPI_OFFSET);
+
+#endif /* SOUTHBRIDGE_INTEL_BD82X6X_NVS_H */
diff --git a/src/southbridge/intel/i82801dx/nvs.h b/src/southbridge/intel/i82801dx/nvs.h
index 3cd0afb1a9..1f8f6d1ad1 100644
--- a/src/southbridge/intel/i82801dx/nvs.h
+++ b/src/southbridge/intel/i82801dx/nvs.h
@@ -1,5 +1,10 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#ifndef SOUTHBRIDGE_INTEL_I82801DX_NVS_H
+#define SOUTHBRIDGE_INTEL_I82801DX_NVS_H
+
+#include <stdint.h>
+
 struct __packed global_nvs {
 	/* Miscellaneous */
 	u16	osys; /* 0x00 - Operating System */
@@ -96,3 +101,5 @@ struct __packed global_nvs {
 	u8	bten;
 	u8	rsvd13[14];
 };
+
+#endif /* SOUTHBRIDGE_INTEL_I82801DX_NVS_H */
diff --git a/src/southbridge/intel/ibexpeak/nvs.h b/src/southbridge/intel/ibexpeak/nvs.h
index 834b3af8a8..8823d83773 100644
--- a/src/southbridge/intel/ibexpeak/nvs.h
+++ b/src/southbridge/intel/ibexpeak/nvs.h
@@ -1,6 +1,10 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#ifndef SOUTHBRIDGE_INTEL_IBEXPEAK_NVS_H
+#define SOUTHBRIDGE_INTEL_IBEXPEAK_NVS_H
+
 #include <commonlib/helpers.h>
+#include <stdint.h>
 #include "vendorcode/google/chromeos/gnvs.h"
 
 struct __packed global_nvs {
@@ -102,3 +106,5 @@ struct __packed global_nvs {
 };
 
 check_member(global_nvs, chromeos, GNVS_CHROMEOS_ACPI_OFFSET);
+
+#endif /* SOUTHBRIDGE_INTEL_IBEXPEAK_NVS_H */
diff --git a/src/southbridge/intel/lynxpoint/nvs.h b/src/southbridge/intel/lynxpoint/nvs.h
index 4abe026354..154e285a4a 100644
--- a/src/southbridge/intel/lynxpoint/nvs.h
+++ b/src/southbridge/intel/lynxpoint/nvs.h
@@ -1,5 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#ifndef SOUTHBRIDGE_INTEL_LYNXPOINT_NVS_H
+#define SOUTHBRIDGE_INTEL_LYNXPOINT_NVS_H
+
 #include <commonlib/helpers.h>
 #include <stdint.h>
 #include "vendorcode/google/chromeos/gnvs.h"
@@ -79,3 +82,5 @@ struct __packed global_nvs {
 };
 
 check_member(global_nvs, chromeos, GNVS_CHROMEOS_ACPI_OFFSET);
+
+#endif /* SOUTHBRIDGE_INTEL_LYNXPOINT_NVS_H */