From e81560c6cf1980144dbb5e15c108db36eae97ce9 Mon Sep 17 00:00:00 2001
From: Angel Pons <th3fanbus@gmail.com>
Date: Thu, 25 Nov 2021 13:15:07 +0100
Subject: mb/prodrive/hermes: Get rid of variant structure

There's no need to use a variant structure here. Only one variant is
used, and revision-specific differences are handled at run-time, and
it's unlikely that another variant will ever exist.

Reorganize the mainboard code to get rid of the variant structure.

Change-Id: I1543f5b76975b0e7183fbb759e9bae5c34151d06
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/59671
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
---
 src/mainboard/prodrive/hermes/mainboard.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/mainboard/prodrive/hermes/mainboard.c')

diff --git a/src/mainboard/prodrive/hermes/mainboard.c b/src/mainboard/prodrive/hermes/mainboard.c
index 6ae6b89104..1155b96944 100644
--- a/src/mainboard/prodrive/hermes/mainboard.c
+++ b/src/mainboard/prodrive/hermes/mainboard.c
@@ -8,10 +8,14 @@
 #include <bootstate.h>
 #include <device/device.h>
 #include <device/dram/spd.h>
+#include <gpio.h>
+#include <intelblocks/gpio_defs.h>
 #include <intelblocks/pmclib.h>
+#include <soc/gpio.h>
 #include <types.h>
 #include <smbios.h>
-#include "variants/baseboard/include/eeprom.h"
+
+#include "eeprom.h"
 #include "gpio.h"
 
 /* FIXME: Example code below */
-- 
cgit v1.2.3