diff --git a/src/soc/intel/common/block/thermal/Makefile.inc b/src/soc/intel/common/block/thermal/Makefile.inc
index 6f216b3f33..951065cd11 100644
--- a/src/soc/intel/common/block/thermal/Makefile.inc
+++ b/src/soc/intel/common/block/thermal/Makefile.inc
@@ -1 +1,2 @@
+romstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL) += thermal.c
 ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL) += thermal.c
diff --git a/src/soc/intel/common/block/thermal/thermal.c b/src/soc/intel/common/block/thermal/thermal.c
index d6e401ed52..4a2d8d88a8 100644
--- a/src/soc/intel/common/block/thermal/thermal.c
+++ b/src/soc/intel/common/block/thermal/thermal.c
@@ -43,7 +43,7 @@ void pch_thermal_configuration(void)
 	uint16_t reg16;
 	uintptr_t thermalbar;
 	uintptr_t thermalbar_pm;
-	struct device *dev;
+	const struct device *dev;
 	struct resource *res;
 
 	dev = pcidev_path_on_root(PCH_DEVFN_THERMAL);