diff --git a/conf/machine/include/qcom-sa8155p.inc b/conf/machine/include/qcom-sa8155p.inc
new file mode 100644
index 0000000..bcd508f
--- /dev/null
+++ b/conf/machine/include/qcom-sa8155p.inc
@@ -0,0 +1,15 @@
+SOC_FAMILY = "sa8155p"
+require conf/machine/include/qcom-common.inc
+DEFAULTTUNE = "armv8-2a-crypto"
+require conf/machine/include/arm/arch-armv8-2a.inc
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
+    pd-mapper \
+    qrtr \
+    rmtfs \
+    tqftpserv \
+"
+
+MACHINE_EXTRA_RRECOMMENDS += " \
+    fastrpc \
+"
diff --git a/conf/machine/sa8155p-adp.conf b/conf/machine/sa8155p-adp.conf
new file mode 100644
index 0000000..dd19991
--- /dev/null
+++ b/conf/machine/sa8155p-adp.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: SA8155P-ADP
+#@DESCRIPTION: Machine configuration for the SA8155P-ADP development board, with Qualcomm Snapdragon 855 SM8150.
+
+require conf/machine/include/qcom-sa8155p.inc
+
+MACHINE_FEATURES = "usbhost usbgadget ext2"
+
+KERNEL_IMAGETYPE ?= "Image.gz"
+KERNEL_DEVICETREE ?= "qcom/sa8155p-adp.dtb"
+
+SERIAL_CONSOLE ?= "115200 ttyMSM0"
+
+# /dev/sda6 is 'userdata' partition for adp board, so wipe it and use for our build
+QCOM_BOOTIMG_ROOTFS ?= "/dev/sda6"
+
+# UFS partitions setup with 4096 logical sector size
+EXTRA_IMAGECMD:ext4 += " -b 4096 "