diff --git a/src/drivers/spi/Makefile.inc b/src/drivers/spi/Makefile.inc
index c594d4e74c..f8cff5afdc 100644
--- a/src/drivers/spi/Makefile.inc
+++ b/src/drivers/spi/Makefile.inc
@@ -11,6 +11,7 @@ ifeq ($(CONFIG_CONSOLE_SPI_FLASH),y)
 bootblock-y += flashconsole.c
 romstage-y += flashconsole.c
 ramstage-y += flashconsole.c
+postcar-y += flashconsole.c
 smm-$(CONFIG_DEBUG_SMI) += flashconsole.c
 
 endif
@@ -98,3 +99,7 @@ smm-$(CONFIG_SPI_FLASH_STMICRO) += stmicro.c
 smm-$(CONFIG_SPI_FLASH_WINBOND) += winbond.c
 smm-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.c
 endif
+
+postcar-y += spi-generic.c
+postcar-$(CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY) += boot_device_rw_nommap.c
+postcar-$(CONFIG_SPI_FLASH) += spi_flash.c
diff --git a/src/soc/intel/common/block/gspi/Makefile.inc b/src/soc/intel/common/block/gspi/Makefile.inc
index 85cb18ebb8..2eb13fa347 100644
--- a/src/soc/intel/common/block/gspi/Makefile.inc
+++ b/src/soc/intel/common/block/gspi/Makefile.inc
@@ -2,3 +2,4 @@ bootblock-$(CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI) += gspi.c
 romstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI) += gspi.c
 ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI) += gspi.c
 verstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI) += gspi.c
+postcar-$(CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI) += gspi.c
diff --git a/src/soc/intel/skylake/Makefile.inc b/src/soc/intel/skylake/Makefile.inc
index d12ba0878a..9a8372b8f1 100644
--- a/src/soc/intel/skylake/Makefile.inc
+++ b/src/soc/intel/skylake/Makefile.inc
@@ -82,6 +82,8 @@ smm-y += uart.c
 
 postcar-y += memmap.c
 postcar-$(CONFIG_UART_DEBUG) += uart_debug.c
+postcar-y += gspi.c
+postcar-y += spi.c
 
 # cpu_microcode_bins += ???