9 files changed, 15 insertions, 37 deletions
diff --git a/src/mainboard/intel/harcuvar/Makefile.inc b/src/mainboard/intel/harcuvar/Makefile.inc
index bfcde9c934..aa1d779b43 100644
--- a/src/mainboard/intel/harcuvar/Makefile.inc
+++ b/src/mainboard/intel/harcuvar/Makefile.inc
@@ -8,6 +8,5 @@ romstage-y += hsio.c
 ramstage-y += ramstage.c
 ramstage-y += boardid.c
 ramstage-y += hsio.c
-ramstage-$(CONFIG_HAVE_ACPI_TABLES) += fadt.c
 
 CPPFLAGS_common += -Isrc/mainboard/$(MAINBOARDDIR)/
diff --git a/src/mainboard/intel/harcuvar/acpi_tables.c b/src/mainboard/intel/harcuvar/acpi_tables.c
index 1351e62876..e03ec0cdca 100644
--- a/src/mainboard/intel/harcuvar/acpi_tables.c
+++ b/src/mainboard/intel/harcuvar/acpi_tables.c
@@ -22,3 +22,8 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	/* TPM Present */
 	gnvs->tpmp = 0;
 }
+
+void motherboard_fill_fadt(acpi_fadt_t *fadt)
+{
+	fadt->preferred_pm_profile = PM_ENTERPRISE_SERVER;
+}
diff --git a/src/mainboard/intel/harcuvar/fadt.c b/src/mainboard/intel/harcuvar/fadt.c
deleted file mode 100644
index fc12fee7e3..0000000000
--- a/src/mainboard/intel/harcuvar/fadt.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi.h>
-
-#include <soc/acpi.h>
-#include <soc/soc_util.h>
-
-void motherboard_fill_fadt(acpi_fadt_t *fadt)
-{
-	fadt->reserved = 0;
-	fadt->preferred_pm_profile = PM_ENTERPRISE_SERVER;
-}
diff --git a/src/mainboard/ocp/tiogapass/Makefile.inc b/src/mainboard/ocp/tiogapass/Makefile.inc
index 39e67beb50..ca4e4637d2 100644
--- a/src/mainboard/ocp/tiogapass/Makefile.inc
+++ b/src/mainboard/ocp/tiogapass/Makefile.inc
@@ -2,7 +2,6 @@
 
 bootblock-y += bootblock.c
 ramstage-y += ramstage.c
-ramstage-$(CONFIG_HAVE_ACPI_TABLES) += fadt.c
 
 CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include
 CPPFLAGS_common += -I$(CONFIG_FSP_HEADER_PATH)
diff --git a/src/mainboard/ocp/tiogapass/acpi_tables.c b/src/mainboard/ocp/tiogapass/acpi_tables.c
index 9a36bd3723..250ccad0a1 100644
--- a/src/mainboard/ocp/tiogapass/acpi_tables.c
+++ b/src/mainboard/ocp/tiogapass/acpi_tables.c
@@ -9,3 +9,8 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	acpi_init_gnvs(gnvs);
 }
+
+void motherboard_fill_fadt(acpi_fadt_t *fadt)
+{
+	fadt->preferred_pm_profile = PM_ENTERPRISE_SERVER;
+}
diff --git a/src/mainboard/ocp/tiogapass/fadt.c b/src/mainboard/ocp/tiogapass/fadt.c
deleted file mode 100644
index 6e077870c2..0000000000
--- a/src/mainboard/ocp/tiogapass/fadt.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include <acpi/acpi.h>
-#include <soc/acpi.h>
-
-void motherboard_fill_fadt(acpi_fadt_t *fadt)
-{
-	fadt->reserved = 0;
-	fadt->preferred_pm_profile = PM_ENTERPRISE_SERVER;
-}
diff --git a/src/mainboard/scaleway/tagada/Makefile.inc b/src/mainboard/scaleway/tagada/Makefile.inc
index fe0fc795b6..97bab195a4 100644
--- a/src/mainboard/scaleway/tagada/Makefile.inc
+++ b/src/mainboard/scaleway/tagada/Makefile.inc
@@ -6,7 +6,6 @@ romstage-y += hsio.c
 
 ramstage-y += ramstage.c
 ramstage-y += hsio.c
-ramstage-$(CONFIG_HAVE_ACPI_TABLES) += fadt.c
 
 bootblock-y += bmcinfo.c
 postcar-y += bmcinfo.c
diff --git a/src/mainboard/scaleway/tagada/acpi_tables.c b/src/mainboard/scaleway/tagada/acpi_tables.c
index 1351e62876..e03ec0cdca 100644
--- a/src/mainboard/scaleway/tagada/acpi_tables.c
+++ b/src/mainboard/scaleway/tagada/acpi_tables.c
@@ -22,3 +22,8 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	/* TPM Present */
 	gnvs->tpmp = 0;
 }
+
+void motherboard_fill_fadt(acpi_fadt_t *fadt)
+{
+	fadt->preferred_pm_profile = PM_ENTERPRISE_SERVER;
+}
diff --git a/src/mainboard/scaleway/tagada/fadt.c b/src/mainboard/scaleway/tagada/fadt.c
deleted file mode 100644
index fc12fee7e3..0000000000
--- a/src/mainboard/scaleway/tagada/fadt.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi.h>
-
-#include <soc/acpi.h>
-#include <soc/soc_util.h>
-
-void motherboard_fill_fadt(acpi_fadt_t *fadt)
-{
-	fadt->reserved = 0;
-	fadt->preferred_pm_profile = PM_ENTERPRISE_SERVER;
-}