From b1194a838b32d0b3f2220f671314d1ba59c112fe Mon Sep 17 00:00:00 2001
From: Matt DeVillier <matt.devillier@gmail.com>
Date: Thu, 5 Mar 2026 15:09:25 -0600
Subject: [PATCH] mb/starlabs: Use common devtree_update mechanism

Remove the explicit devtree_update() call from mainboard configuration.
The devtree_update hook is provided by src/lib/devtree_update.c and runs
at BS_PRE_DEVICE. Drop the variant declarations from variants.h and add
the devtree_update header in each variant devtree.c so their overrides
are used via the common mechanism.

TEST=build/boot Starlabs Starfighter MTL

Change-Id: Ia7ceaaefe717566c6411f86d81d3a76bdfb2b2ea
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/91573
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/starlabs/adl/include/variants.h             | 2 --
 src/mainboard/starlabs/adl/mainboard.c                    | 2 --
 src/mainboard/starlabs/adl/variants/hz/devtree.c          | 1 +
 src/mainboard/starlabs/adl/variants/i5/devtree.c          | 1 +
 src/mainboard/starlabs/adl/variants/y2/devtree.c          | 1 +
 src/mainboard/starlabs/lite/devtree.c                     | 1 +
 src/mainboard/starlabs/lite/include/variants.h            | 2 --
 src/mainboard/starlabs/starbook/include/variants.h        | 2 --
 src/mainboard/starlabs/starbook/variants/adl/devtree.c    | 1 +
 src/mainboard/starlabs/starbook/variants/adl_n/devtree.c  | 1 +
 src/mainboard/starlabs/starbook/variants/cml/devtree.c    | 1 +
 src/mainboard/starlabs/starbook/variants/kbl/devtree.c    | 1 +
 src/mainboard/starlabs/starbook/variants/mtl/devtree.c    | 1 +
 src/mainboard/starlabs/starbook/variants/rpl/devtree.c    | 1 +
 src/mainboard/starlabs/starbook/variants/tgl/devtree.c    | 1 +
 src/mainboard/starlabs/starfighter/include/variants.h     | 2 --
 src/mainboard/starlabs/starfighter/variants/mtl/devtree.c | 1 +
 src/mainboard/starlabs/starfighter/variants/rpl/devtree.c | 1 +
 18 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/mainboard/starlabs/adl/include/variants.h b/src/mainboard/starlabs/adl/include/variants.h
index 536ac891ae..f9dc0ee73b 100644
--- a/src/mainboard/starlabs/adl/include/variants.h
+++ b/src/mainboard/starlabs/adl/include/variants.h
@@ -13,8 +13,6 @@
 const struct pad_config *variant_gpio_table(size_t *num);
 const struct pad_config *variant_early_gpio_table(size_t *num);
 
-void devtree_update(void);
-
 void starlabs_adl_mainboard_fill_ssdt(const struct device *dev);
 
 #endif /* _BASEBOARD_VARIANTS_H_ */
diff --git a/src/mainboard/starlabs/adl/mainboard.c b/src/mainboard/starlabs/adl/mainboard.c
index 940584b151..d7a0dab9a8 100644
--- a/src/mainboard/starlabs/adl/mainboard.c
+++ b/src/mainboard/starlabs/adl/mainboard.c
@@ -13,8 +13,6 @@ static void starlabs_configure_mainboard(void *unused)
 
 	pads = variant_gpio_table(&num);
 	gpio_configure_pads(pads, num);
-
-	devtree_update();
 }
 
 BOOT_STATE_INIT_ENTRY(BS_PRE_DEVICE, BS_ON_ENTRY, starlabs_configure_mainboard, NULL);
diff --git a/src/mainboard/starlabs/adl/variants/hz/devtree.c b/src/mainboard/starlabs/adl/variants/hz/devtree.c
index 3ae2d08956..7f1ddfc9ec 100644
--- a/src/mainboard/starlabs/adl/variants/hz/devtree.c
+++ b/src/mainboard/starlabs/adl/variants/hz/devtree.c
@@ -4,6 +4,7 @@
 #include <cpu/intel/turbo.h>
 #include <device/device.h>
 #include <device/pci_def.h>
+#include <devtree_update.h>
 #include <option.h>
 #include <static.h>
 #include <types.h>
diff --git a/src/mainboard/starlabs/adl/variants/i5/devtree.c b/src/mainboard/starlabs/adl/variants/i5/devtree.c
index 4a13543bf6..6dee98c4df 100644
--- a/src/mainboard/starlabs/adl/variants/i5/devtree.c
+++ b/src/mainboard/starlabs/adl/variants/i5/devtree.c
@@ -4,6 +4,7 @@
 #include <cpu/intel/turbo.h>
 #include <device/device.h>
 #include <device/pci_def.h>
+#include <devtree_update.h>
 #include <option.h>
 #include <static.h>
 #include <types.h>
diff --git a/src/mainboard/starlabs/adl/variants/y2/devtree.c b/src/mainboard/starlabs/adl/variants/y2/devtree.c
index aaa5fdafae..607f1374ed 100644
--- a/src/mainboard/starlabs/adl/variants/y2/devtree.c
+++ b/src/mainboard/starlabs/adl/variants/y2/devtree.c
@@ -4,6 +4,7 @@
 #include <cpu/intel/turbo.h>
 #include <device/device.h>
 #include <device/pci_def.h>
+#include <devtree_update.h>
 #include <option.h>
 #include <static.h>
 #include <types.h>
diff --git a/src/mainboard/starlabs/lite/devtree.c b/src/mainboard/starlabs/lite/devtree.c
index afbd1bba11..b453196788 100644
--- a/src/mainboard/starlabs/lite/devtree.c
+++ b/src/mainboard/starlabs/lite/devtree.c
@@ -3,6 +3,7 @@
 #include <cpu/intel/turbo.h>
 #include <device/device.h>
 #include <device/pci_def.h>
+#include <devtree_update.h>
 #include <option.h>
 #include <static.h>
 #include <types.h>
diff --git a/src/mainboard/starlabs/lite/include/variants.h b/src/mainboard/starlabs/lite/include/variants.h
index 781a8313f2..ef4ecf7409 100644
--- a/src/mainboard/starlabs/lite/include/variants.h
+++ b/src/mainboard/starlabs/lite/include/variants.h
@@ -12,6 +12,4 @@
 const struct pad_config *variant_gpio_table(size_t *num);
 const struct pad_config *variant_early_gpio_table(size_t *num);
 
-void devtree_update(void);
-
 #endif /* _BASEBOARD_VARIANTS_H_ */
diff --git a/src/mainboard/starlabs/starbook/include/variants.h b/src/mainboard/starlabs/starbook/include/variants.h
index 781a8313f2..ef4ecf7409 100644
--- a/src/mainboard/starlabs/starbook/include/variants.h
+++ b/src/mainboard/starlabs/starbook/include/variants.h
@@ -12,6 +12,4 @@
 const struct pad_config *variant_gpio_table(size_t *num);
 const struct pad_config *variant_early_gpio_table(size_t *num);
 
-void devtree_update(void);
-
 #endif /* _BASEBOARD_VARIANTS_H_ */
diff --git a/src/mainboard/starlabs/starbook/variants/adl/devtree.c b/src/mainboard/starlabs/starbook/variants/adl/devtree.c
index 3379e02dae..8c51abe73c 100644
--- a/src/mainboard/starlabs/starbook/variants/adl/devtree.c
+++ b/src/mainboard/starlabs/starbook/variants/adl/devtree.c
@@ -4,6 +4,7 @@
 #include <cpu/intel/turbo.h>
 #include <device/device.h>
 #include <device/pci_def.h>
+#include <devtree_update.h>
 #include <option.h>
 #include <static.h>
 #include <types.h>
diff --git a/src/mainboard/starlabs/starbook/variants/adl_n/devtree.c b/src/mainboard/starlabs/starbook/variants/adl_n/devtree.c
index 1b01e25cb0..001965d1ea 100644
--- a/src/mainboard/starlabs/starbook/variants/adl_n/devtree.c
+++ b/src/mainboard/starlabs/starbook/variants/adl_n/devtree.c
@@ -4,6 +4,7 @@
 #include <cpu/intel/turbo.h>
 #include <device/device.h>
 #include <device/pci_def.h>
+#include <devtree_update.h>
 #include <option.h>
 #include <static.h>
 #include <types.h>
diff --git a/src/mainboard/starlabs/starbook/variants/cml/devtree.c b/src/mainboard/starlabs/starbook/variants/cml/devtree.c
index 980a472abc..6ed8999261 100644
--- a/src/mainboard/starlabs/starbook/variants/cml/devtree.c
+++ b/src/mainboard/starlabs/starbook/variants/cml/devtree.c
@@ -4,6 +4,7 @@
 #include <cpu/intel/turbo.h>
 #include <device/device.h>
 #include <device/pci_def.h>
+#include <devtree_update.h>
 #include <option.h>
 #include <static.h>
 #include <types.h>
diff --git a/src/mainboard/starlabs/starbook/variants/kbl/devtree.c b/src/mainboard/starlabs/starbook/variants/kbl/devtree.c
index 2dd0f995ab..851a083fb0 100644
--- a/src/mainboard/starlabs/starbook/variants/kbl/devtree.c
+++ b/src/mainboard/starlabs/starbook/variants/kbl/devtree.c
@@ -4,6 +4,7 @@
 #include <cpu/intel/turbo.h>
 #include <device/device.h>
 #include <device/pci_def.h>
+#include <devtree_update.h>
 #include <option.h>
 #include <static.h>
 #include <types.h>
diff --git a/src/mainboard/starlabs/starbook/variants/mtl/devtree.c b/src/mainboard/starlabs/starbook/variants/mtl/devtree.c
index 0b2cd1b959..0eedb7c599 100644
--- a/src/mainboard/starlabs/starbook/variants/mtl/devtree.c
+++ b/src/mainboard/starlabs/starbook/variants/mtl/devtree.c
@@ -4,6 +4,7 @@
 #include <cpu/intel/turbo.h>
 #include <device/device.h>
 #include <device/pci_def.h>
+#include <devtree_update.h>
 #include <option.h>
 #include <static.h>
 #include <types.h>
diff --git a/src/mainboard/starlabs/starbook/variants/rpl/devtree.c b/src/mainboard/starlabs/starbook/variants/rpl/devtree.c
index fe9ec1b3e2..6fe7fcf812 100644
--- a/src/mainboard/starlabs/starbook/variants/rpl/devtree.c
+++ b/src/mainboard/starlabs/starbook/variants/rpl/devtree.c
@@ -4,6 +4,7 @@
 #include <cpu/intel/turbo.h>
 #include <device/device.h>
 #include <device/pci_def.h>
+#include <devtree_update.h>
 #include <option.h>
 #include <static.h>
 #include <types.h>
diff --git a/src/mainboard/starlabs/starbook/variants/tgl/devtree.c b/src/mainboard/starlabs/starbook/variants/tgl/devtree.c
index 796624e1c6..ef23fb632e 100644
--- a/src/mainboard/starlabs/starbook/variants/tgl/devtree.c
+++ b/src/mainboard/starlabs/starbook/variants/tgl/devtree.c
@@ -4,6 +4,7 @@
 #include <cpu/intel/turbo.h>
 #include <device/device.h>
 #include <device/pci_def.h>
+#include <devtree_update.h>
 #include <option.h>
 #include <static.h>
 #include <types.h>
diff --git a/src/mainboard/starlabs/starfighter/include/variants.h b/src/mainboard/starlabs/starfighter/include/variants.h
index b3334870b1..0bdd25bd9d 100644
--- a/src/mainboard/starlabs/starfighter/include/variants.h
+++ b/src/mainboard/starlabs/starfighter/include/variants.h
@@ -14,6 +14,4 @@ uint8_t get_memory_config_straps(void);
 const struct pad_config *variant_gpio_table(size_t *num);
 const struct pad_config *variant_early_gpio_table(size_t *num);
 
-void devtree_update(void);
-
 #endif /* _BASEBOARD_VARIANTS_H_ */
diff --git a/src/mainboard/starlabs/starfighter/variants/mtl/devtree.c b/src/mainboard/starlabs/starfighter/variants/mtl/devtree.c
index 5ac632b4b7..fc41e37e7d 100644
--- a/src/mainboard/starlabs/starfighter/variants/mtl/devtree.c
+++ b/src/mainboard/starlabs/starfighter/variants/mtl/devtree.c
@@ -4,6 +4,7 @@
 #include <cpu/intel/turbo.h>
 #include <device/device.h>
 #include <device/pci_def.h>
+#include <devtree_update.h>
 #include <option.h>
 #include <static.h>
 #include <types.h>
diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/devtree.c b/src/mainboard/starlabs/starfighter/variants/rpl/devtree.c
index aea5d89b40..f2d497fa2f 100644
--- a/src/mainboard/starlabs/starfighter/variants/rpl/devtree.c
+++ b/src/mainboard/starlabs/starfighter/variants/rpl/devtree.c
@@ -4,6 +4,7 @@
 #include <cpu/intel/turbo.h>
 #include <device/device.h>
 #include <device/pci_def.h>
+#include <devtree_update.h>
 #include <option.h>
 #include <static.h>
 #include <types.h>