From 11f6177ebbee5b593c176cd2488153dca8c4dd0d Mon Sep 17 00:00:00 2001
From: Tim Crawford <tcrawford@system76.com>
Date: Wed, 17 Aug 2022 11:51:19 -0600
Subject: [PATCH] mb/system76/gaze16: Move stray header to include folder

Change-Id: Id3367a708744d6a3ed0ba69ed8e0cafe0a5934b6
Signed-off-by: Tim Crawford <tcrawford@system76.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/66166
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
 .../system76/gaze16/{variant.h => include/variant/romstage.h} | 4 ++--
 src/mainboard/system76/gaze16/romstage.c                      | 3 +--
 src/mainboard/system76/gaze16/variants/gaze16-3050/romstage.c | 2 +-
 src/mainboard/system76/gaze16/variants/gaze16-3060/romstage.c | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)
 rename src/mainboard/system76/gaze16/{variant.h => include/variant/romstage.h} (71%)

diff --git a/src/mainboard/system76/gaze16/variant.h b/src/mainboard/system76/gaze16/include/variant/romstage.h
similarity index 71%
rename from src/mainboard/system76/gaze16/variant.h
rename to src/mainboard/system76/gaze16/include/variant/romstage.h
index 1f66112f5a..9008cb95f2 100644
--- a/src/mainboard/system76/gaze16/variant.h
+++ b/src/mainboard/system76/gaze16/include/variant/romstage.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#ifndef VARIANT_H
-#define VARIANT_H
+#ifndef VARIANT_ROMSTAGE_H
+#define VARIANT_ROMSTAGE_H
 
 #include <fsp/soc_binding.h>
 
diff --git a/src/mainboard/system76/gaze16/romstage.c b/src/mainboard/system76/gaze16/romstage.c
index 119c3f5d38..f69bae98eb 100644
--- a/src/mainboard/system76/gaze16/romstage.c
+++ b/src/mainboard/system76/gaze16/romstage.c
@@ -1,9 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <fsp/util.h>
 #include <soc/meminit.h>
 #include <soc/romstage.h>
-#include "variant.h"
+#include <variant/romstage.h>
 
 static const struct mb_cfg board_cfg = {
 	.type = MEM_TYPE_DDR4,
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3050/romstage.c b/src/mainboard/system76/gaze16/variants/gaze16-3050/romstage.c
index aa9f34f7ad..f28c0c23d3 100644
--- a/src/mainboard/system76/gaze16/variants/gaze16-3050/romstage.c
+++ b/src/mainboard/system76/gaze16/variants/gaze16-3050/romstage.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include "../../variant.h"
+#include <variant/romstage.h>
 
 void variant_memory_init_params(FSPM_UPD *mupd)
 {
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3060/romstage.c b/src/mainboard/system76/gaze16/variants/gaze16-3060/romstage.c
index 578a61e76d..ed8397caf8 100644
--- a/src/mainboard/system76/gaze16/variants/gaze16-3060/romstage.c
+++ b/src/mainboard/system76/gaze16/variants/gaze16-3060/romstage.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include "../../variant.h"
 #include <soc/pch.h>
+#include <variant/romstage.h>
 
 void variant_memory_init_params(FSPM_UPD *mupd)
 {