diff --git a/src/soc/intel/Makefile.inc b/src/soc/intel/Makefile.mk
similarity index 100%
rename from src/soc/intel/Makefile.inc
rename to src/soc/intel/Makefile.mk
diff --git a/src/soc/intel/alderlake/Makefile.inc b/src/soc/intel/alderlake/Makefile.mk
similarity index 100%
rename from src/soc/intel/alderlake/Makefile.inc
rename to src/soc/intel/alderlake/Makefile.mk
diff --git a/src/soc/intel/alderlake/romstage/Makefile.inc b/src/soc/intel/alderlake/romstage/Makefile.mk
similarity index 100%
rename from src/soc/intel/alderlake/romstage/Makefile.inc
rename to src/soc/intel/alderlake/romstage/Makefile.mk
diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.mk
similarity index 100%
rename from src/soc/intel/apollolake/Makefile.inc
rename to src/soc/intel/apollolake/Makefile.mk
diff --git a/src/soc/intel/baytrail/Makefile.inc b/src/soc/intel/baytrail/Makefile.mk
similarity index 100%
rename from src/soc/intel/baytrail/Makefile.inc
rename to src/soc/intel/baytrail/Makefile.mk
diff --git a/src/soc/intel/baytrail/romstage/Makefile.inc b/src/soc/intel/baytrail/romstage/Makefile.mk
similarity index 100%
rename from src/soc/intel/baytrail/romstage/Makefile.inc
rename to src/soc/intel/baytrail/romstage/Makefile.mk
diff --git a/src/soc/intel/braswell/Makefile.inc b/src/soc/intel/braswell/Makefile.mk
similarity index 100%
rename from src/soc/intel/braswell/Makefile.inc
rename to src/soc/intel/braswell/Makefile.mk
diff --git a/src/soc/intel/braswell/romstage/Makefile.inc b/src/soc/intel/braswell/romstage/Makefile.mk
similarity index 100%
rename from src/soc/intel/braswell/romstage/Makefile.inc
rename to src/soc/intel/braswell/romstage/Makefile.mk
diff --git a/src/soc/intel/broadwell/Makefile.inc b/src/soc/intel/broadwell/Makefile.mk
similarity index 100%
rename from src/soc/intel/broadwell/Makefile.inc
rename to src/soc/intel/broadwell/Makefile.mk
diff --git a/src/soc/intel/broadwell/pch/Makefile.inc b/src/soc/intel/broadwell/pch/Makefile.mk
similarity index 100%
rename from src/soc/intel/broadwell/pch/Makefile.inc
rename to src/soc/intel/broadwell/pch/Makefile.mk
diff --git a/src/soc/intel/cannonlake/Makefile.inc b/src/soc/intel/cannonlake/Makefile.mk
similarity index 100%
rename from src/soc/intel/cannonlake/Makefile.inc
rename to src/soc/intel/cannonlake/Makefile.mk
diff --git a/src/soc/intel/cannonlake/cnl_memcfg_init.c b/src/soc/intel/cannonlake/cnl_memcfg_init.c
index 448e56cc7a..db488ee626 100644
--- a/src/soc/intel/cannonlake/cnl_memcfg_init.c
+++ b/src/soc/intel/cannonlake/cnl_memcfg_init.c
@@ -74,7 +74,7 @@ static void meminit_spd_data(FSP_M_CONFIG *mem_cfg, uint8_t mem_slot,
 /*
  * Initialize default memory settings using the spd file specified by
  * spd_index. The spd_index is an index into the SPD_SOURCES array defined
- * in spd/Makefile.inc.
+ * in spd/Makefile.mk.
  */
 static void meminit_cbfs_spd_index(FSP_M_CONFIG *mem_cfg,
 				   int spd_index, uint8_t mem_slot)
diff --git a/src/soc/intel/cannonlake/romstage/Makefile.inc b/src/soc/intel/cannonlake/romstage/Makefile.mk
similarity index 100%
rename from src/soc/intel/cannonlake/romstage/Makefile.inc
rename to src/soc/intel/cannonlake/romstage/Makefile.mk
diff --git a/src/soc/intel/common/Makefile.inc b/src/soc/intel/common/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/Makefile.inc
rename to src/soc/intel/common/Makefile.mk
diff --git a/src/soc/intel/common/basecode/Makefile.inc b/src/soc/intel/common/basecode/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/basecode/Makefile.inc
rename to src/soc/intel/common/basecode/Makefile.mk
diff --git a/src/soc/intel/common/basecode/debug/Makefile.inc b/src/soc/intel/common/basecode/debug/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/basecode/debug/Makefile.inc
rename to src/soc/intel/common/basecode/debug/Makefile.mk
diff --git a/src/soc/intel/common/basecode/ramtop/Makefile.inc b/src/soc/intel/common/basecode/ramtop/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/basecode/ramtop/Makefile.inc
rename to src/soc/intel/common/basecode/ramtop/Makefile.mk
diff --git a/src/soc/intel/common/block/Makefile.inc b/src/soc/intel/common/block/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/Makefile.inc
rename to src/soc/intel/common/block/Makefile.mk
diff --git a/src/soc/intel/common/block/acpi/Makefile.inc b/src/soc/intel/common/block/acpi/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/acpi/Makefile.inc
rename to src/soc/intel/common/block/acpi/Makefile.mk
diff --git a/src/soc/intel/common/block/chip/Makefile.inc b/src/soc/intel/common/block/chip/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/chip/Makefile.inc
rename to src/soc/intel/common/block/chip/Makefile.mk
diff --git a/src/soc/intel/common/block/cnvi/Makefile.inc b/src/soc/intel/common/block/cnvi/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/cnvi/Makefile.inc
rename to src/soc/intel/common/block/cnvi/Makefile.mk
diff --git a/src/soc/intel/common/block/cpu/Makefile.inc b/src/soc/intel/common/block/cpu/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/cpu/Makefile.inc
rename to src/soc/intel/common/block/cpu/Makefile.mk
diff --git a/src/soc/intel/common/block/crashlog/Makefile.inc b/src/soc/intel/common/block/crashlog/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/crashlog/Makefile.inc
rename to src/soc/intel/common/block/crashlog/Makefile.mk
diff --git a/src/soc/intel/common/block/cse/Makefile.inc b/src/soc/intel/common/block/cse/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/cse/Makefile.inc
rename to src/soc/intel/common/block/cse/Makefile.mk
diff --git a/src/soc/intel/common/block/dsp/Makefile.inc b/src/soc/intel/common/block/dsp/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/dsp/Makefile.inc
rename to src/soc/intel/common/block/dsp/Makefile.mk
diff --git a/src/soc/intel/common/block/dtt/Makefile.inc b/src/soc/intel/common/block/dtt/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/dtt/Makefile.inc
rename to src/soc/intel/common/block/dtt/Makefile.mk
diff --git a/src/soc/intel/common/block/fast_spi/Makefile.inc b/src/soc/intel/common/block/fast_spi/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/fast_spi/Makefile.inc
rename to src/soc/intel/common/block/fast_spi/Makefile.mk
diff --git a/src/soc/intel/common/block/gpio/Makefile.inc b/src/soc/intel/common/block/gpio/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/gpio/Makefile.inc
rename to src/soc/intel/common/block/gpio/Makefile.mk
diff --git a/src/soc/intel/common/block/gpmr/Makefile.inc b/src/soc/intel/common/block/gpmr/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/gpmr/Makefile.inc
rename to src/soc/intel/common/block/gpmr/Makefile.mk
diff --git a/src/soc/intel/common/block/graphics/Makefile.inc b/src/soc/intel/common/block/graphics/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/graphics/Makefile.inc
rename to src/soc/intel/common/block/graphics/Makefile.mk
diff --git a/src/soc/intel/common/block/gspi/Makefile.inc b/src/soc/intel/common/block/gspi/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/gspi/Makefile.inc
rename to src/soc/intel/common/block/gspi/Makefile.mk
diff --git a/src/soc/intel/common/block/hda/Makefile.inc b/src/soc/intel/common/block/hda/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/hda/Makefile.inc
rename to src/soc/intel/common/block/hda/Makefile.mk
diff --git a/src/soc/intel/common/block/i2c/Makefile.inc b/src/soc/intel/common/block/i2c/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/i2c/Makefile.inc
rename to src/soc/intel/common/block/i2c/Makefile.mk
diff --git a/src/soc/intel/common/block/ioc/Makefile.inc b/src/soc/intel/common/block/ioc/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/ioc/Makefile.inc
rename to src/soc/intel/common/block/ioc/Makefile.mk
diff --git a/src/soc/intel/common/block/ipu/Makefile.inc b/src/soc/intel/common/block/ipu/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/ipu/Makefile.inc
rename to src/soc/intel/common/block/ipu/Makefile.mk
diff --git a/src/soc/intel/common/block/irq/Makefile.inc b/src/soc/intel/common/block/irq/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/irq/Makefile.inc
rename to src/soc/intel/common/block/irq/Makefile.mk
diff --git a/src/soc/intel/common/block/itss/Makefile.inc b/src/soc/intel/common/block/itss/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/itss/Makefile.inc
rename to src/soc/intel/common/block/itss/Makefile.mk
diff --git a/src/soc/intel/common/block/lpc/Makefile.inc b/src/soc/intel/common/block/lpc/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/lpc/Makefile.inc
rename to src/soc/intel/common/block/lpc/Makefile.mk
diff --git a/src/soc/intel/common/block/lpss/Makefile.inc b/src/soc/intel/common/block/lpss/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/lpss/Makefile.inc
rename to src/soc/intel/common/block/lpss/Makefile.mk
diff --git a/src/soc/intel/common/block/memory/Makefile.inc b/src/soc/intel/common/block/memory/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/memory/Makefile.inc
rename to src/soc/intel/common/block/memory/Makefile.mk
diff --git a/src/soc/intel/common/block/oc_wdt/Makefile.inc b/src/soc/intel/common/block/oc_wdt/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/oc_wdt/Makefile.inc
rename to src/soc/intel/common/block/oc_wdt/Makefile.mk
diff --git a/src/soc/intel/common/block/p2sb/Makefile.inc b/src/soc/intel/common/block/p2sb/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/p2sb/Makefile.inc
rename to src/soc/intel/common/block/p2sb/Makefile.mk
diff --git a/src/soc/intel/common/block/pcie/Makefile.inc b/src/soc/intel/common/block/pcie/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/pcie/Makefile.inc
rename to src/soc/intel/common/block/pcie/Makefile.mk
diff --git a/src/soc/intel/common/block/pcie/rtd3/Makefile.inc b/src/soc/intel/common/block/pcie/rtd3/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/pcie/rtd3/Makefile.inc
rename to src/soc/intel/common/block/pcie/rtd3/Makefile.mk
diff --git a/src/soc/intel/common/block/pcr/Makefile.inc b/src/soc/intel/common/block/pcr/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/pcr/Makefile.inc
rename to src/soc/intel/common/block/pcr/Makefile.mk
diff --git a/src/soc/intel/common/block/pmc/Makefile.inc b/src/soc/intel/common/block/pmc/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/pmc/Makefile.inc
rename to src/soc/intel/common/block/pmc/Makefile.mk
diff --git a/src/soc/intel/common/block/power_limit/Makefile.inc b/src/soc/intel/common/block/power_limit/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/power_limit/Makefile.inc
rename to src/soc/intel/common/block/power_limit/Makefile.mk
diff --git a/src/soc/intel/common/block/rtc/Makefile.inc b/src/soc/intel/common/block/rtc/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/rtc/Makefile.inc
rename to src/soc/intel/common/block/rtc/Makefile.mk
diff --git a/src/soc/intel/common/block/sata/Makefile.inc b/src/soc/intel/common/block/sata/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/sata/Makefile.inc
rename to src/soc/intel/common/block/sata/Makefile.mk
diff --git a/src/soc/intel/common/block/scs/Makefile.inc b/src/soc/intel/common/block/scs/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/scs/Makefile.inc
rename to src/soc/intel/common/block/scs/Makefile.mk
diff --git a/src/soc/intel/common/block/sgx/Makefile.inc b/src/soc/intel/common/block/sgx/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/sgx/Makefile.inc
rename to src/soc/intel/common/block/sgx/Makefile.mk
diff --git a/src/soc/intel/common/block/smbus/Makefile.inc b/src/soc/intel/common/block/smbus/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/smbus/Makefile.inc
rename to src/soc/intel/common/block/smbus/Makefile.mk
diff --git a/src/soc/intel/common/block/smm/Makefile.inc b/src/soc/intel/common/block/smm/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/smm/Makefile.inc
rename to src/soc/intel/common/block/smm/Makefile.mk
diff --git a/src/soc/intel/common/block/spi/Makefile.inc b/src/soc/intel/common/block/spi/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/spi/Makefile.inc
rename to src/soc/intel/common/block/spi/Makefile.mk
diff --git a/src/soc/intel/common/block/sram/Makefile.inc b/src/soc/intel/common/block/sram/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/sram/Makefile.inc
rename to src/soc/intel/common/block/sram/Makefile.mk
diff --git a/src/soc/intel/common/block/systemagent/Makefile.inc b/src/soc/intel/common/block/systemagent/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/systemagent/Makefile.inc
rename to src/soc/intel/common/block/systemagent/Makefile.mk
diff --git a/src/soc/intel/common/block/tcss/Makefile.inc b/src/soc/intel/common/block/tcss/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/tcss/Makefile.inc
rename to src/soc/intel/common/block/tcss/Makefile.mk
diff --git a/src/soc/intel/common/block/thermal/Makefile.inc b/src/soc/intel/common/block/thermal/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/thermal/Makefile.inc
rename to src/soc/intel/common/block/thermal/Makefile.mk
diff --git a/src/soc/intel/common/block/timer/Makefile.inc b/src/soc/intel/common/block/timer/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/timer/Makefile.inc
rename to src/soc/intel/common/block/timer/Makefile.mk
diff --git a/src/soc/intel/common/block/tracehub/Makefile.inc b/src/soc/intel/common/block/tracehub/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/tracehub/Makefile.inc
rename to src/soc/intel/common/block/tracehub/Makefile.mk
diff --git a/src/soc/intel/common/block/uart/Makefile.inc b/src/soc/intel/common/block/uart/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/uart/Makefile.inc
rename to src/soc/intel/common/block/uart/Makefile.mk
diff --git a/src/soc/intel/common/block/usb4/Makefile.inc b/src/soc/intel/common/block/usb4/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/usb4/Makefile.inc
rename to src/soc/intel/common/block/usb4/Makefile.mk
diff --git a/src/soc/intel/common/block/vtd/Makefile.inc b/src/soc/intel/common/block/vtd/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/vtd/Makefile.inc
rename to src/soc/intel/common/block/vtd/Makefile.mk
diff --git a/src/soc/intel/common/block/xdci/Makefile.inc b/src/soc/intel/common/block/xdci/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/xdci/Makefile.inc
rename to src/soc/intel/common/block/xdci/Makefile.mk
diff --git a/src/soc/intel/common/block/xhci/Makefile.inc b/src/soc/intel/common/block/xhci/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/block/xhci/Makefile.inc
rename to src/soc/intel/common/block/xhci/Makefile.mk
diff --git a/src/soc/intel/common/pch/Makefile.inc b/src/soc/intel/common/pch/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/pch/Makefile.inc
rename to src/soc/intel/common/pch/Makefile.mk
diff --git a/src/soc/intel/common/pch/lockdown/Makefile.inc b/src/soc/intel/common/pch/lockdown/Makefile.mk
similarity index 100%
rename from src/soc/intel/common/pch/lockdown/Makefile.inc
rename to src/soc/intel/common/pch/lockdown/Makefile.mk
diff --git a/src/soc/intel/denverton_ns/Makefile.inc b/src/soc/intel/denverton_ns/Makefile.mk
similarity index 100%
rename from src/soc/intel/denverton_ns/Makefile.inc
rename to src/soc/intel/denverton_ns/Makefile.mk
diff --git a/src/soc/intel/elkhartlake/Makefile.inc b/src/soc/intel/elkhartlake/Makefile.mk
similarity index 100%
rename from src/soc/intel/elkhartlake/Makefile.inc
rename to src/soc/intel/elkhartlake/Makefile.mk
diff --git a/src/soc/intel/elkhartlake/romstage/Makefile.inc b/src/soc/intel/elkhartlake/romstage/Makefile.mk
similarity index 100%
rename from src/soc/intel/elkhartlake/romstage/Makefile.inc
rename to src/soc/intel/elkhartlake/romstage/Makefile.mk
diff --git a/src/soc/intel/jasperlake/Makefile.inc b/src/soc/intel/jasperlake/Makefile.mk
similarity index 100%
rename from src/soc/intel/jasperlake/Makefile.inc
rename to src/soc/intel/jasperlake/Makefile.mk
diff --git a/src/soc/intel/jasperlake/romstage/Makefile.inc b/src/soc/intel/jasperlake/romstage/Makefile.mk
similarity index 100%
rename from src/soc/intel/jasperlake/romstage/Makefile.inc
rename to src/soc/intel/jasperlake/romstage/Makefile.mk
diff --git a/src/soc/intel/meteorlake/Makefile.inc b/src/soc/intel/meteorlake/Makefile.mk
similarity index 100%
rename from src/soc/intel/meteorlake/Makefile.inc
rename to src/soc/intel/meteorlake/Makefile.mk
diff --git a/src/soc/intel/meteorlake/romstage/Makefile.inc b/src/soc/intel/meteorlake/romstage/Makefile.mk
similarity index 100%
rename from src/soc/intel/meteorlake/romstage/Makefile.inc
rename to src/soc/intel/meteorlake/romstage/Makefile.mk
diff --git a/src/soc/intel/skylake/Makefile.inc b/src/soc/intel/skylake/Makefile.mk
similarity index 100%
rename from src/soc/intel/skylake/Makefile.inc
rename to src/soc/intel/skylake/Makefile.mk
diff --git a/src/soc/intel/skylake/nhlt/Makefile.inc b/src/soc/intel/skylake/nhlt/Makefile.mk
similarity index 100%
rename from src/soc/intel/skylake/nhlt/Makefile.inc
rename to src/soc/intel/skylake/nhlt/Makefile.mk
diff --git a/src/soc/intel/skylake/romstage/Makefile.inc b/src/soc/intel/skylake/romstage/Makefile.mk
similarity index 100%
rename from src/soc/intel/skylake/romstage/Makefile.inc
rename to src/soc/intel/skylake/romstage/Makefile.mk
diff --git a/src/soc/intel/tigerlake/Makefile.inc b/src/soc/intel/tigerlake/Makefile.mk
similarity index 100%
rename from src/soc/intel/tigerlake/Makefile.inc
rename to src/soc/intel/tigerlake/Makefile.mk
diff --git a/src/soc/intel/tigerlake/romstage/Makefile.inc b/src/soc/intel/tigerlake/romstage/Makefile.mk
similarity index 100%
rename from src/soc/intel/tigerlake/romstage/Makefile.inc
rename to src/soc/intel/tigerlake/romstage/Makefile.mk
diff --git a/src/soc/intel/xeon_sp/Makefile.inc b/src/soc/intel/xeon_sp/Makefile.mk
similarity index 100%
rename from src/soc/intel/xeon_sp/Makefile.inc
rename to src/soc/intel/xeon_sp/Makefile.mk
diff --git a/src/soc/intel/xeon_sp/cpx/Makefile.inc b/src/soc/intel/xeon_sp/cpx/Makefile.mk
similarity index 100%
rename from src/soc/intel/xeon_sp/cpx/Makefile.inc
rename to src/soc/intel/xeon_sp/cpx/Makefile.mk
diff --git a/src/soc/intel/xeon_sp/ebg/Makefile.inc b/src/soc/intel/xeon_sp/ebg/Makefile.mk
similarity index 100%
rename from src/soc/intel/xeon_sp/ebg/Makefile.inc
rename to src/soc/intel/xeon_sp/ebg/Makefile.mk
diff --git a/src/soc/intel/xeon_sp/lbg/Makefile.inc b/src/soc/intel/xeon_sp/lbg/Makefile.mk
similarity index 100%
rename from src/soc/intel/xeon_sp/lbg/Makefile.inc
rename to src/soc/intel/xeon_sp/lbg/Makefile.mk
diff --git a/src/soc/intel/xeon_sp/ras/Makefile.inc b/src/soc/intel/xeon_sp/ras/Makefile.mk
similarity index 100%
rename from src/soc/intel/xeon_sp/ras/Makefile.inc
rename to src/soc/intel/xeon_sp/ras/Makefile.mk
diff --git a/src/soc/intel/xeon_sp/skx/Makefile.inc b/src/soc/intel/xeon_sp/skx/Makefile.mk
similarity index 100%
rename from src/soc/intel/xeon_sp/skx/Makefile.inc
rename to src/soc/intel/xeon_sp/skx/Makefile.mk
diff --git a/src/soc/intel/xeon_sp/spr/Makefile.inc b/src/soc/intel/xeon_sp/spr/Makefile.mk
similarity index 100%
rename from src/soc/intel/xeon_sp/spr/Makefile.inc
rename to src/soc/intel/xeon_sp/spr/Makefile.mk