diff --git a/src/southbridge/intel/lynxpoint/bootblock.c b/src/southbridge/intel/lynxpoint/bootblock.c
index b015ea28d1..d142d3e6b7 100644
--- a/src/southbridge/intel/lynxpoint/bootblock.c
+++ b/src/southbridge/intel/lynxpoint/bootblock.c
@@ -2,25 +2,9 @@
 
 #include <arch/bootblock.h>
 #include <device/pci_ops.h>
+#include <southbridge/intel/common/early_spi.h>
 #include "pch.h"
 
-/*
- * Enable Prefetching and Caching.
- */
-static void enable_spi_prefetch(void)
-{
-	u8 reg8;
-	pci_devfn_t dev;
-
-	dev = PCI_DEV(0, 0x1f, 0);
-
-	reg8 = pci_read_config8(dev, 0xdc);
-	reg8 &= ~(3 << 2);
-	reg8 |= (2 << 2); /* Prefetching and Caching Enabled */
-	pci_write_config8(dev, 0xdc, reg8);
-}
-
-
 static void map_rcba(void)
 {
 	pci_devfn_t dev = PCI_DEV(0, 0x1f, 0);
@@ -60,7 +44,7 @@ static void set_spi_speed(void)
 void bootblock_early_southbridge_init(void)
 {
 	map_rcba();
-	enable_spi_prefetch();
+	enable_spi_prefetching_and_caching();
 	enable_port80_on_lpc();
 	set_spi_speed();