diff --git a/src/soc/intel/baytrail/Makefile.inc b/src/soc/intel/baytrail/Makefile.inc
index 6e6eb9cc44..3ad6a8f978 100644
--- a/src/soc/intel/baytrail/Makefile.inc
+++ b/src/soc/intel/baytrail/Makefile.inc
@@ -9,50 +9,53 @@ subdirs-y += ../../../cpu/intel/microcode
 subdirs-y += ../../../cpu/intel/turbo
 subdirs-y += ../../../cpu/intel/common
 
-ramstage-y += memmap.c
-romstage-y += memmap.c
-postcar-y += memmap.c
-ramstage-y += tsc_freq.c
-romstage-y += tsc_freq.c
-postcar-y += tsc_freq.c
-smm-y += tsc_freq.c
-romstage-y += spi.c
-postcar-y += spi.c
-ramstage-y += spi.c
-smm-y += spi.c
-ramstage-y += chip.c
-ramstage-y += gfx.c
-ramstage-y += iosf.c
 romstage-y += iosf.c
-smm-y += iosf.c
-postcar-y += iosf.c
-ramstage-y += northcluster.c
-ramstage-y += ramstage.c
-ramstage-y += gpio.c
-ramstage-y += cpu.c
+romstage-y += memmap.c
 romstage-y += pmutil.c
+romstage-y += spi.c
+romstage-y += stage_cache.c
+romstage-y += tsc_freq.c
+
+postcar-y += iosf.c
+postcar-y += memmap.c
+postcar-y += spi.c
+postcar-y += tsc_freq.c
+
+ramstage-y += acpi.c
+ramstage-y += chip.c
+ramstage-y += cpu.c
+ramstage-y += dptf.c
+ramstage-y += ehci.c
+ramstage-y += emmc.c
+ramstage-y += gfx.c
+ramstage-y += gpio.c
+ramstage-y += hda.c
+ramstage-y += iosf.c
+ramstage-y += lpe.c
+ramstage-y += lpss.c
+ramstage-y += memmap.c
+ramstage-y += northcluster.c
+ramstage-y += pcie.c
+ramstage-y += perf_power.c
 ramstage-y += pmutil.c
+ramstage-y += ramstage.c
+ramstage-y += sata.c
+ramstage-y += scc.c
+ramstage-y += sd.c
+ramstage-y += smm.c
+ramstage-y += southcluster.c
+ramstage-y += spi.c
+ramstage-y += stage_cache.c
+ramstage-y += tsc_freq.c
+ramstage-y += xhci.c
+ramstage-$(CONFIG_ELOG) += elog.c
+ramstage-$(CONFIG_HAVE_REFCODE_BLOB) += refcode.c
+
+smm-y += iosf.c
 smm-y += pmutil.c
 smm-y += smihandler.c
-ramstage-y += smm.c
-ramstage-y += ehci.c
-ramstage-y += xhci.c
-ramstage-y += southcluster.c
-ramstage-$(CONFIG_HAVE_REFCODE_BLOB) += refcode.c
-ramstage-y += sata.c
-ramstage-y += acpi.c
-ramstage-y += lpe.c
-ramstage-y += scc.c
-ramstage-y += emmc.c
-ramstage-y += lpss.c
-ramstage-y += pcie.c
-ramstage-y += sd.c
-ramstage-y += dptf.c
-ramstage-y += perf_power.c
-ramstage-y += stage_cache.c
-romstage-y += stage_cache.c
-ramstage-$(CONFIG_ELOG) += elog.c
-ramstage-y += hda.c
+smm-y += spi.c
+smm-y += tsc_freq.c
 
 # Remove as ramstage gets fleshed out
 ramstage-y += placeholders.c