diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc
index a4ed87f45d..11da0b3815 100644
--- a/src/soc/intel/apollolake/Makefile.inc
+++ b/src/soc/intel/apollolake/Makefile.inc
@@ -155,7 +155,7 @@ endif
 # table + pointer, but reserving the pointer is still needed. Otherwise the
 # IBBL loader thrashes code there. So include fit.c so that the linker
 # reserves that pointer.
-bootblock-y += ../../../cpu/intel/fit/fit.c
+bootblock-y += bootblock/fit.c
 
 # DSP firmware settings files.
 ifeq ($(CONFIG_SOC_INTEL_GEMINILAKE),y)
diff --git a/src/soc/intel/apollolake/bootblock/fit.c b/src/soc/intel/apollolake/bootblock/fit.c
new file mode 100644
index 0000000000..0728f53cbd
--- /dev/null
+++ b/src/soc/intel/apollolake/bootblock/fit.c
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <stdint.h>
+
+/*
+ * At runtime TXE creates the FIT table in the shared SRAM and patches the bootblock
+ * at the fixed address 4G - 64 byte with a pointer to this FIT table. In order to be able
+ * to pre-compute the PCR value for the bootblock this FIT pointer needs to be added to the
+ * image as well. Since the FIT location is fixed in TXE, this can be done at build time.
+ */
+__attribute__((used, __section__(".fit_pointer"))) const uint64_t fit_ptr = 0xfffe0000;