13 files changed, 11 insertions, 30 deletions
diff --git a/src/soc/amd/genoa_poc/acpi.c b/src/soc/amd/genoa_poc/acpi.c
index fc223047be..9b8011dcc6 100644
--- a/src/soc/amd/genoa_poc/acpi.c
+++ b/src/soc/amd/genoa_poc/acpi.c
@@ -8,7 +8,7 @@
 #include <amdblocks/cpu.h>
 #include <arch/ioapic.h>
 #include <device/device.h>
-#include <vendorcode/amd/opensil/genoa_poc/opensil.h>
+#include <vendorcode/amd/opensil/opensil.h>
 
 void acpi_fill_fadt(acpi_fadt_t *fadt)
 {
diff --git a/src/soc/amd/genoa_poc/chip.c b/src/soc/amd/genoa_poc/chip.c
index a763dab862..75f5bccb00 100644
--- a/src/soc/amd/genoa_poc/chip.c
+++ b/src/soc/amd/genoa_poc/chip.c
@@ -5,7 +5,7 @@
 #include <device/device.h>
 #include <soc/southbridge.h>
 #include <soc/southbridge.h>
-#include <vendorcode/amd/opensil/genoa_poc/opensil.h>
+#include <vendorcode/amd/opensil/opensil.h>
 
 static void soc_init(void *chip_info)
 {
diff --git a/src/soc/amd/genoa_poc/domain.c b/src/soc/amd/genoa_poc/domain.c
index b6369a47d0..65b13958cb 100644
--- a/src/soc/amd/genoa_poc/domain.c
+++ b/src/soc/amd/genoa_poc/domain.c
@@ -11,7 +11,7 @@
 #include <device/device.h>
 #include <types.h>
 
-#include <vendorcode/amd/opensil/genoa_poc/opensil.h>
+#include <vendorcode/amd/opensil/opensil.h>
 
 #define IOHC_IOAPIC_BASE_ADDR_LO 0x2f0
 
diff --git a/src/soc/amd/phoenix/acpi.c b/src/soc/amd/phoenix/acpi.c
index c96d80c5fb..c6e06be0bb 100644
--- a/src/soc/amd/phoenix/acpi.c
+++ b/src/soc/amd/phoenix/acpi.c
@@ -19,7 +19,7 @@
 #include <device/device.h>
 #include <soc/iomap.h>
 #include <types.h>
-#include <vendorcode/amd/opensil/genoa_poc/opensil.h>
+#include <vendorcode/amd/opensil/opensil.h>
 #include "chip.h"
 
 /*
diff --git a/src/soc/amd/phoenix/chip.c b/src/soc/amd/phoenix/chip.c
index a88468b28d..68bc408d2b 100644
--- a/src/soc/amd/phoenix/chip.c
+++ b/src/soc/amd/phoenix/chip.c
@@ -14,7 +14,7 @@
 #include <soc/pci_devs.h>
 #include <soc/southbridge.h>
 #include <types.h>
-#include <vendorcode/amd/opensil/stub/opensil.h>
+#include <vendorcode/amd/opensil/opensil.h>
 #include "chip.h"
 
 static const char *soc_acpi_name(const struct device *dev)
diff --git a/src/soc/amd/phoenix/memmap.c b/src/soc/amd/phoenix/memmap.c
index 9e740cbb9c..d29dcbee63 100644
--- a/src/soc/amd/phoenix/memmap.c
+++ b/src/soc/amd/phoenix/memmap.c
@@ -5,7 +5,7 @@
 #include <amdblocks/root_complex.h>
 #include <device/device.h>
 #include <stdint.h>
-#include <vendorcode/amd/opensil/stub/opensil.h>
+#include <vendorcode/amd/opensil/opensil.h>
 
 /*
  *                     +--------------------------------+
diff --git a/src/vendorcode/amd/opensil/genoa_poc/acpi.c b/src/vendorcode/amd/opensil/genoa_poc/acpi.c
index a0af4a3f3e..f539798d69 100644
--- a/src/vendorcode/amd/opensil/genoa_poc/acpi.c
+++ b/src/vendorcode/amd/opensil/genoa_poc/acpi.c
@@ -5,7 +5,7 @@
 #include <SilCommon.h>
 #include <xSIM-api.h>
 #include <FCH/Common/FchCommonCfg.h>
-#include "opensil.h"
+#include "../opensil.h"
 
 void opensil_fill_fadt_io_ports(acpi_fadt_t *fadt)
 {
diff --git a/src/vendorcode/amd/opensil/genoa_poc/memmap.c b/src/vendorcode/amd/opensil/genoa_poc/memmap.c
index 6261ad0260..ece9877183 100644
--- a/src/vendorcode/amd/opensil/genoa_poc/memmap.c
+++ b/src/vendorcode/amd/opensil/genoa_poc/memmap.c
@@ -12,7 +12,7 @@
 #include <cbmem.h>
 #include <amdblocks/memmap.h>
 
-#include "opensil.h"
+#include "../opensil.h"
 
 static const char *hole_info_type(MEMORY_HOLE_TYPES type)
 {
diff --git a/src/vendorcode/amd/opensil/genoa_poc/mpio/chip.c b/src/vendorcode/amd/opensil/genoa_poc/mpio/chip.c
index b3710341b7..cd7b9a1cba 100644
--- a/src/vendorcode/amd/opensil/genoa_poc/mpio/chip.c
+++ b/src/vendorcode/amd/opensil/genoa_poc/mpio/chip.c
@@ -7,7 +7,7 @@
 #include <device/device.h>
 #include <device/pci_def.h>
 #include "chip.h"
-#include "../opensil.h"
+#include "../../opensil.h"
 
 struct chip_operations vendorcode_amd_opensil_chip_mpio_ops = {
 	.name = "AMD GENOA MPIO",
diff --git a/src/vendorcode/amd/opensil/genoa_poc/ramstage.c b/src/vendorcode/amd/opensil/genoa_poc/ramstage.c
index 843f073a36..b18ccc9836 100644
--- a/src/vendorcode/amd/opensil/genoa_poc/ramstage.c
+++ b/src/vendorcode/amd/opensil/genoa_poc/ramstage.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <xSIM-api.h>
 #include "opensil_console.h"
-#include "opensil.h"
+#include "../opensil.h"
 
 void SIL_STATUS_report(const char *function, const int status)
 {
diff --git a/src/vendorcode/amd/opensil/genoa_poc/opensil.h b/src/vendorcode/amd/opensil/opensil.h
index 1aa2f06423..1aa2f06423 100644
--- a/src/vendorcode/amd/opensil/genoa_poc/opensil.h
+++ b/src/vendorcode/amd/opensil/opensil.h
diff --git a/src/vendorcode/amd/opensil/stub/opensil.h b/src/vendorcode/amd/opensil/stub/opensil.h
deleted file mode 100644
index 9563403e6b..0000000000
--- a/src/vendorcode/amd/opensil/stub/opensil.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef _OPENSIL_H_
-#define _OPENSIL_H_
-
-#include <acpi/acpi.h>
-#include <device/device.h>
-
-// Add the memory map to dev, starting at index idx, returns last use idx
-void add_opensil_memmap(struct device *dev, unsigned long *idx);
-// Fill in FADT from openSIL
-void opensil_fill_fadt_io_ports(acpi_fadt_t *fadt);
-
-void setup_opensil(void);
-void opensil_xSIM_timepoint_1(void);
-void opensil_xSIM_timepoint_2(void);
-void opensil_xSIM_timepoint_3(void);
-
-#endif
diff --git a/src/vendorcode/amd/opensil/stub/ramstage.c b/src/vendorcode/amd/opensil/stub/ramstage.c
index 76cbaf8441..0674140646 100644
--- a/src/vendorcode/amd/opensil/stub/ramstage.c
+++ b/src/vendorcode/amd/opensil/stub/ramstage.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi.h>
 #include <amdblocks/acpi.h>
 #include <device/device.h>
-#include "opensil.h"
+#include "../opensil.h"
 
 void add_opensil_memmap(struct device *dev, unsigned long *idx)
 {