diff --git a/src/soc/amd/cezanne/Makefile.inc b/src/soc/amd/cezanne/Makefile.mk
similarity index 100%
rename from src/soc/amd/cezanne/Makefile.inc
rename to src/soc/amd/cezanne/Makefile.mk
diff --git a/src/soc/amd/cezanne/psp_verstage/Makefile.inc b/src/soc/amd/cezanne/psp_verstage/Makefile.mk
similarity index 100%
rename from src/soc/amd/cezanne/psp_verstage/Makefile.inc
rename to src/soc/amd/cezanne/psp_verstage/Makefile.mk
diff --git a/src/soc/amd/common/Makefile.inc b/src/soc/amd/common/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/Makefile.inc
rename to src/soc/amd/common/Makefile.mk
diff --git a/src/soc/amd/common/block/Makefile.inc b/src/soc/amd/common/block/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/Makefile.inc
rename to src/soc/amd/common/block/Makefile.mk
diff --git a/src/soc/amd/common/block/acp/Makefile.inc b/src/soc/amd/common/block/acp/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/acp/Makefile.inc
rename to src/soc/amd/common/block/acp/Makefile.mk
diff --git a/src/soc/amd/common/block/acpi/Makefile.inc b/src/soc/amd/common/block/acpi/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/acpi/Makefile.inc
rename to src/soc/amd/common/block/acpi/Makefile.mk
diff --git a/src/soc/amd/common/block/acpimmio/Makefile.inc b/src/soc/amd/common/block/acpimmio/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/acpimmio/Makefile.inc
rename to src/soc/amd/common/block/acpimmio/Makefile.mk
diff --git a/src/soc/amd/common/block/alink/Makefile.inc b/src/soc/amd/common/block/alink/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/alink/Makefile.inc
rename to src/soc/amd/common/block/alink/Makefile.mk
diff --git a/src/soc/amd/common/block/aoac/Makefile.inc b/src/soc/amd/common/block/aoac/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/aoac/Makefile.inc
rename to src/soc/amd/common/block/aoac/Makefile.mk
diff --git a/src/soc/amd/common/block/apob/Makefile.inc b/src/soc/amd/common/block/apob/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/apob/Makefile.inc
rename to src/soc/amd/common/block/apob/Makefile.mk
diff --git a/src/soc/amd/common/block/cpu/Makefile.inc b/src/soc/amd/common/block/cpu/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/cpu/Makefile.inc
rename to src/soc/amd/common/block/cpu/Makefile.mk
diff --git a/src/soc/amd/common/block/cpu/car/Makefile.inc b/src/soc/amd/common/block/cpu/car/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/cpu/car/Makefile.inc
rename to src/soc/amd/common/block/cpu/car/Makefile.mk
diff --git a/src/soc/amd/common/block/cpu/mca/Makefile.inc b/src/soc/amd/common/block/cpu/mca/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/cpu/mca/Makefile.inc
rename to src/soc/amd/common/block/cpu/mca/Makefile.mk
diff --git a/src/soc/amd/common/block/cpu/noncar/Makefile.inc b/src/soc/amd/common/block/cpu/noncar/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/cpu/noncar/Makefile.inc
rename to src/soc/amd/common/block/cpu/noncar/Makefile.mk
diff --git a/src/soc/amd/common/block/cpu/smm/Makefile.inc b/src/soc/amd/common/block/cpu/smm/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/cpu/smm/Makefile.inc
rename to src/soc/amd/common/block/cpu/smm/Makefile.mk
diff --git a/src/soc/amd/common/block/cpu/tsc/Makefile.inc b/src/soc/amd/common/block/cpu/tsc/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/cpu/tsc/Makefile.inc
rename to src/soc/amd/common/block/cpu/tsc/Makefile.mk
diff --git a/src/soc/amd/common/block/data_fabric/Makefile.inc b/src/soc/amd/common/block/data_fabric/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/data_fabric/Makefile.inc
rename to src/soc/amd/common/block/data_fabric/Makefile.mk
diff --git a/src/soc/amd/common/block/emmc/Makefile.inc b/src/soc/amd/common/block/emmc/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/emmc/Makefile.inc
rename to src/soc/amd/common/block/emmc/Makefile.mk
diff --git a/src/soc/amd/common/block/gpio/Makefile.inc b/src/soc/amd/common/block/gpio/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/gpio/Makefile.inc
rename to src/soc/amd/common/block/gpio/Makefile.mk
diff --git a/src/soc/amd/common/block/graphics/Makefile.inc b/src/soc/amd/common/block/graphics/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/graphics/Makefile.inc
rename to src/soc/amd/common/block/graphics/Makefile.mk
diff --git a/src/soc/amd/common/block/hda/Makefile.inc b/src/soc/amd/common/block/hda/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/hda/Makefile.inc
rename to src/soc/amd/common/block/hda/Makefile.mk
diff --git a/src/soc/amd/common/block/i2c/Makefile.inc b/src/soc/amd/common/block/i2c/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/i2c/Makefile.inc
rename to src/soc/amd/common/block/i2c/Makefile.mk
diff --git a/src/soc/amd/common/block/iommu/Makefile.inc b/src/soc/amd/common/block/iommu/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/iommu/Makefile.inc
rename to src/soc/amd/common/block/iommu/Makefile.mk
diff --git a/src/soc/amd/common/block/lpc/Makefile.inc b/src/soc/amd/common/block/lpc/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/lpc/Makefile.inc
rename to src/soc/amd/common/block/lpc/Makefile.mk
diff --git a/src/soc/amd/common/block/pci/Makefile.inc b/src/soc/amd/common/block/pci/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/pci/Makefile.inc
rename to src/soc/amd/common/block/pci/Makefile.mk
diff --git a/src/soc/amd/common/block/pm/Makefile.inc b/src/soc/amd/common/block/pm/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/pm/Makefile.inc
rename to src/soc/amd/common/block/pm/Makefile.mk
diff --git a/src/soc/amd/common/block/psp/Makefile.inc b/src/soc/amd/common/block/psp/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/psp/Makefile.inc
rename to src/soc/amd/common/block/psp/Makefile.mk
diff --git a/src/soc/amd/common/block/root_complex/Makefile.inc b/src/soc/amd/common/block/root_complex/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/root_complex/Makefile.inc
rename to src/soc/amd/common/block/root_complex/Makefile.mk
diff --git a/src/soc/amd/common/block/sata/Makefile.inc b/src/soc/amd/common/block/sata/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/sata/Makefile.inc
rename to src/soc/amd/common/block/sata/Makefile.mk
diff --git a/src/soc/amd/common/block/simnow/Makefile.inc b/src/soc/amd/common/block/simnow/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/simnow/Makefile.inc
rename to src/soc/amd/common/block/simnow/Makefile.mk
diff --git a/src/soc/amd/common/block/smbus/Makefile.inc b/src/soc/amd/common/block/smbus/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/smbus/Makefile.inc
rename to src/soc/amd/common/block/smbus/Makefile.mk
diff --git a/src/soc/amd/common/block/smi/Makefile.inc b/src/soc/amd/common/block/smi/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/smi/Makefile.inc
rename to src/soc/amd/common/block/smi/Makefile.mk
diff --git a/src/soc/amd/common/block/smn/Makefile.inc b/src/soc/amd/common/block/smn/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/smn/Makefile.inc
rename to src/soc/amd/common/block/smn/Makefile.mk
diff --git a/src/soc/amd/common/block/smu/Makefile.inc b/src/soc/amd/common/block/smu/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/smu/Makefile.inc
rename to src/soc/amd/common/block/smu/Makefile.mk
diff --git a/src/soc/amd/common/block/spi/Makefile.inc b/src/soc/amd/common/block/spi/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/spi/Makefile.inc
rename to src/soc/amd/common/block/spi/Makefile.mk
diff --git a/src/soc/amd/common/block/stb/Makefile.inc b/src/soc/amd/common/block/stb/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/stb/Makefile.inc
rename to src/soc/amd/common/block/stb/Makefile.mk
diff --git a/src/soc/amd/common/block/uart/Makefile.inc b/src/soc/amd/common/block/uart/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/uart/Makefile.inc
rename to src/soc/amd/common/block/uart/Makefile.mk
diff --git a/src/soc/amd/common/block/xhci/Makefile.inc b/src/soc/amd/common/block/xhci/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/block/xhci/Makefile.inc
rename to src/soc/amd/common/block/xhci/Makefile.mk
diff --git a/src/soc/amd/common/fsp/Makefile.inc b/src/soc/amd/common/fsp/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/fsp/Makefile.inc
rename to src/soc/amd/common/fsp/Makefile.mk
diff --git a/src/soc/amd/common/fsp/pci/Makefile.inc b/src/soc/amd/common/fsp/pci/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/fsp/pci/Makefile.inc
rename to src/soc/amd/common/fsp/pci/Makefile.mk
diff --git a/src/soc/amd/common/pi/Makefile.inc b/src/soc/amd/common/pi/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/pi/Makefile.inc
rename to src/soc/amd/common/pi/Makefile.mk
diff --git a/src/soc/amd/common/psp_verstage/Makefile.inc b/src/soc/amd/common/psp_verstage/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/psp_verstage/Makefile.inc
rename to src/soc/amd/common/psp_verstage/Makefile.mk
diff --git a/src/soc/amd/common/vboot/Makefile.inc b/src/soc/amd/common/vboot/Makefile.mk
similarity index 100%
rename from src/soc/amd/common/vboot/Makefile.inc
rename to src/soc/amd/common/vboot/Makefile.mk
diff --git a/src/soc/amd/genoa_poc/Makefile.inc b/src/soc/amd/genoa_poc/Makefile.mk
similarity index 100%
rename from src/soc/amd/genoa_poc/Makefile.inc
rename to src/soc/amd/genoa_poc/Makefile.mk
diff --git a/src/soc/amd/glinda/Makefile.inc b/src/soc/amd/glinda/Makefile.mk
similarity index 100%
rename from src/soc/amd/glinda/Makefile.inc
rename to src/soc/amd/glinda/Makefile.mk
diff --git a/src/soc/amd/glinda/psp_verstage/Makefile.inc b/src/soc/amd/glinda/psp_verstage/Makefile.mk
similarity index 100%
rename from src/soc/amd/glinda/psp_verstage/Makefile.inc
rename to src/soc/amd/glinda/psp_verstage/Makefile.mk
diff --git a/src/soc/amd/mendocino/Makefile.inc b/src/soc/amd/mendocino/Makefile.mk
similarity index 100%
rename from src/soc/amd/mendocino/Makefile.inc
rename to src/soc/amd/mendocino/Makefile.mk
diff --git a/src/soc/amd/mendocino/psp_verstage/Makefile.inc b/src/soc/amd/mendocino/psp_verstage/Makefile.mk
similarity index 100%
rename from src/soc/amd/mendocino/psp_verstage/Makefile.inc
rename to src/soc/amd/mendocino/psp_verstage/Makefile.mk
diff --git a/src/soc/amd/phoenix/Makefile.inc b/src/soc/amd/phoenix/Makefile.mk
similarity index 100%
rename from src/soc/amd/phoenix/Makefile.inc
rename to src/soc/amd/phoenix/Makefile.mk
diff --git a/src/soc/amd/phoenix/psp_verstage/Makefile.inc b/src/soc/amd/phoenix/psp_verstage/Makefile.mk
similarity index 100%
rename from src/soc/amd/phoenix/psp_verstage/Makefile.inc
rename to src/soc/amd/phoenix/psp_verstage/Makefile.mk
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.mk
similarity index 100%
rename from src/soc/amd/picasso/Makefile.inc
rename to src/soc/amd/picasso/Makefile.mk
diff --git a/src/soc/amd/picasso/psp_verstage/Makefile.inc b/src/soc/amd/picasso/psp_verstage/Makefile.mk
similarity index 100%
rename from src/soc/amd/picasso/psp_verstage/Makefile.inc
rename to src/soc/amd/picasso/psp_verstage/Makefile.mk
diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.mk
similarity index 100%
rename from src/soc/amd/stoneyridge/Makefile.inc
rename to src/soc/amd/stoneyridge/Makefile.mk