diff --git a/src/soc/qualcomm/x1p42100/Makefile.mk b/src/soc/qualcomm/x1p42100/Makefile.mk
index 85191ea52c..787d0db78b 100644
--- a/src/soc/qualcomm/x1p42100/Makefile.mk
+++ b/src/soc/qualcomm/x1p42100/Makefile.mk
@@ -295,6 +295,31 @@ $(HYPAC_CFG_FILE_CBFS)-type := payload
 $(HYPAC_CFG_FILE_CBFS)-compression := $(CBFS_COMPRESS_FLAG)
 cbfs-files-y += $(HYPAC_CFG_FILE_CBFS)
 
+################################################################################
+ifeq ($(CONFIG_QC_APDP_ENABLE),y)
+
+APDP_FILE := $(X1P42100_BLOB)/qtee/apdp.mbn
+APDP_CBFS := $(CONFIG_CBFS_PREFIX)/apdp
+$(APDP_CBFS)-file := $(APDP_FILE)
+$(APDP_CBFS)-type := payload
+$(APDP_CBFS)-compression := $(CBFS_COMPRESS_FLAG)
+cbfs-files-y += $(APDP_CBFS)
+
+################################################################################
+# Rule to create apdp_meta from apdp.mbn
+# This rule depends on apdp.mbn being built and the extractor script existing.
+$(obj)/mainboard/$(MAINBOARDDIR)/apdp_meta: $(X1P42100_BLOB)/qtee/apdp.mbn util/qualcomm/elf_segment_extractor.py
+	@echo "Extracting ELF headers and hash table segment from $< to $@"
+	@util/qualcomm/elf_segment_extractor.py --eh --pht --hashtable $< $@
+
+APDP_META_FILE := $(obj)/mainboard/$(MAINBOARDDIR)/apdp_meta
+APDP_META_CBFS := $(CONFIG_CBFS_PREFIX)/apdp_meta
+$(APDP_META_CBFS)-file := $(APDP_META_FILE)
+$(APDP_META_CBFS)-type := raw
+$(APDP_META_CBFS)-compression := $(CBFS_COMPRESS_FLAG)
+cbfs-files-y += $(APDP_META_CBFS)
+
+endif # ifeq ($(CONFIG_QC_APDP_ENABLE),y)
 endif # ifeq ($(CONFIG_USE_QC_BLOBS),y)
 
 endif # ifeq ($(CONFIG_QC_BLOBS_UPSTREAM),y)
diff --git a/src/soc/qualcomm/x1p42100/memlayout.ld b/src/soc/qualcomm/x1p42100/memlayout.ld
index 3cb7506668..afc38d3336 100644
--- a/src/soc/qualcomm/x1p42100/memlayout.ld
+++ b/src/soc/qualcomm/x1p42100/memlayout.ld
@@ -110,6 +110,8 @@
  *               |                       qclib                              |      |
  * 0x14897000    +----------------------------------------------------------+      |
  *               |                ... Usable memory ...                     |      |
+ * 0x14891000    +----------------------------------------------------------+      |
+ *               |                  apdp_ramdump_meta                       |      |
  * 0x14890000    +----------------------------------------------------------+      |
  *               |                    aop_blob_meta                         |      |
  * 0x1488C000    +----------------------------------------------------------+      |
@@ -207,6 +209,7 @@ SECTIONS
 	REGION(ddr_training, 0x14878000, 64K, 4K)
 	REGION(qc_blob_meta, 0x14888000, 16K, 4K)
 	REGION(aop_blob_meta, 0x1488c000, 16K, 4K)
+	REGION(apdp_ramdump_meta, 0x14890000, 4K, 4K)
 	REGION(qclib, 0x14897000, 1536K, 4K)
 	REGION(cpr_settings, 0x14A17000, 12K, 4K)
 	PRERAM_CBMEM_CONSOLE(0x14A30000, 32K)