9 files changed, 114 insertions, 123 deletions
diff --git a/conf/machine/include/qcom-apq8016.inc b/conf/machine/include/qcom-apq8016.inc
index 2688b20..5414a7a 100644
--- a/conf/machine/include/qcom-apq8016.inc
+++ b/conf/machine/include/qcom-apq8016.inc
@@ -1,26 +1,6 @@
 SOC_FAMILY = "apq8016"
-require conf/machine/include/soc-family.inc
-
-XSERVER_OPENGL ?= " \
-    xf86-video-modesetting \
-    xserver-xorg-extension-glx \
-"
-
-XSERVER ?= " \
-    xserver-xorg \
-    xserver-xorg-module-libint10 \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${XSERVER_OPENGL}', 'xf86-video-fbdev', d)} \
-    xf86-input-evdev \
-    xf86-input-mouse \
-    xf86-input-keyboard \
-"
-
-PREFERRED_PROVIDER_virtual/egl ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-qcomlt"
+require conf/machine/include/qcom-common.inc
+require conf/machine/include/arm/armv8a/tune-cortexa53.inc
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
     qrtr \
@@ -31,9 +11,5 @@ MACHINE_EXTRA_RRECOMMENDS += " \
     fastrpc \
 "
 
-# Fastboot expects an ext4 image, which needs to be 4096 aligned
-IMAGE_FSTYPES ?= "ext4.gz"
-IMAGE_ROOTFS_ALIGNMENT = "4096"
-
-QCOM_BOOTIMG_KERNEL_BASE ?= "0x80000000"
-QCOM_BOOTIMG_PAGE_SIZE ?= "2048"
+# Android boot image settings
+QCOM_BOOTIMG_PAGE_SIZE = "2048"
diff --git a/conf/machine/include/qcom-apq8064.inc b/conf/machine/include/qcom-apq8064.inc
index b0da78e..e2f0c25 100644
--- a/conf/machine/include/qcom-apq8064.inc
+++ b/conf/machine/include/qcom-apq8064.inc
@@ -1,29 +1,7 @@
 SOC_FAMILY = "apq8064"
-require conf/machine/include/soc-family.inc
-require conf/machine/include/tune-cortexa8.inc
+require conf/machine/include/qcom-common.inc
+DEFAULTTUNE = "cortexa15thf-neon-vfpv4"
+require conf/machine/include/arm/armv7a/tune-cortexa15.inc
 
-XSERVER_OPENGL ?= "xf86-video-modesetting \
-                   xserver-xorg-extension-glx \
-                  "
-
-XSERVER = " \
-	xserver-xorg \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${XSERVER_OPENGL}', 'xf86-video-fbdev', d)} \
-	xf86-input-mouse \
-	xf86-input-keyboard \
-	xf86-input-evdev \
-"
-
-PREFERRED_PROVIDER_virtual/egl ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-PREFERRED_PROVIDER_virtual/kernel = "linux-linaro-qcomlt"
-
-# Fastboot expects an ext4 image, which needs to be 4096 aligned
-IMAGE_FSTYPES ?= "ext4.gz"
-IMAGE_ROOTFS_ALIGNMENT = "4096"
-
-QCOM_BOOTIMG_KERNEL_BASE ?= "0x80200000"
-QCOM_BOOTIMG_PAGE_SIZE ?= "2048"
+# Android boot image settings
+QCOM_BOOTIMG_PAGE_SIZE = "2048"
diff --git a/conf/machine/include/qcom-apq8096.inc b/conf/machine/include/qcom-apq8096.inc
index 3a6a08b..ea875b0 100644
--- a/conf/machine/include/qcom-apq8096.inc
+++ b/conf/machine/include/qcom-apq8096.inc
@@ -1,28 +1,8 @@
 SOC_FAMILY = "apq8096"
-require conf/machine/include/soc-family.inc
+require conf/machine/include/qcom-common.inc
+DEFAULTTUNE = "armv8a-crc-crypto"
 require conf/machine/include/arm/arch-armv8a.inc
 
-XSERVER_OPENGL ?= " \
-    xf86-video-modesetting \
-    xserver-xorg-extension-glx \
-"
-
-XSERVER ?= " \
-    xserver-xorg \
-    xserver-xorg-module-libint10 \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${XSERVER_OPENGL}', 'xf86-video-fbdev', d)} \
-    xf86-input-evdev \
-    xf86-input-mouse \
-    xf86-input-keyboard \
-"
-
-PREFERRED_PROVIDER_virtual/egl ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-qcomlt"
-
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
     qrtr \
     rmtfs \
@@ -31,10 +11,3 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
 MACHINE_EXTRA_RRECOMMENDS += " \
     fastrpc \
 "
-
-# Fastboot expects an ext4 image, which needs to be 4096 aligned
-IMAGE_FSTYPES ?= "ext4.gz"
-IMAGE_ROOTFS_ALIGNMENT = "4096"
-
-QCOM_BOOTIMG_KERNEL_BASE ?= "0x80000000"
-QCOM_BOOTIMG_PAGE_SIZE ?= "4096"
diff --git a/conf/machine/include/qcom-common.inc b/conf/machine/include/qcom-common.inc
new file mode 100644
index 0000000..da57da8
--- /dev/null
+++ b/conf/machine/include/qcom-common.inc
@@ -0,0 +1,57 @@
+SOC_FAMILY:prepend = "qcom:"
+require conf/machine/include/soc-family.inc
+
+XSERVER_OPENGL ?= " \
+    xf86-video-modesetting \
+    xserver-xorg-extension-glx \
+"
+
+XSERVER ?= " \
+    xserver-xorg \
+    xserver-xorg-module-libint10 \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${XSERVER_OPENGL}', 'xf86-video-fbdev', d)} \
+    xf86-input-evdev \
+"
+
+PREFERRED_PROVIDER_virtual/egl ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/kernel ??= "linux-linaro-qcomlt"
+
+PREFERRED_PROVIDER_android-tools-conf = "android-tools-conf-configfs"
+
+# Fastboot expects an ext4 image, which needs to be 4096 aligned
+IMAGE_FSTYPES ?= "ext4.gz"
+IMAGE_ROOTFS_ALIGNMENT ?= "4096"
+
+# Android boot image settings
+QCOM_BOOTIMG_KERNEL_BASE ?= "0x80000000"
+QCOM_BOOTIMG_PAGE_SIZE ?= "4096"
+
+# Default serial console for QCOM devices
+SERIAL_CONSOLES ?= "115200;ttyMSM0"
+
+# Increase INITRAMFS_MAXSIZE to 384 MiB to cover initramfs-kerneltest-full
+# image.  All our boards (except db410c) have 2GiB and db410c has 1GiB of RAM,
+# so this image would fit.
+INITRAMFS_MAXSIZE = "393216"
+
+# Use systemd-boot as the EFI bootloader
+EFI_PROVIDER = "systemd-boot"
+
+# Install packages at root of ESP
+EFI_PREFIX = ""
+
+# Location of dtb inside ESP
+EFI_DTB_DIR ?= "${EFI_PREFIX}dtb"
+
+# Unified Kernel Image (UKI) name
+EFI_LINUX_IMG ?= "linux-${MACHINE}.efi"
+
+# Place dtb at EFIDTDIR to seamlessly package
+KERNEL_DTBDEST = "${EFI_DTB_DIR}"
+
+# UKI generation needs uncompressed Kernel image
+KERNEL_IMAGETYPES:append = " Image"
diff --git a/conf/machine/include/qcom-qcs404.inc b/conf/machine/include/qcom-qcs404.inc
index 9c556d3..90f9acb 100644
--- a/conf/machine/include/qcom-qcs404.inc
+++ b/conf/machine/include/qcom-qcs404.inc
@@ -1,16 +1,7 @@
 SOC_FAMILY = "qcs404"
-require conf/machine/include/soc-family.inc
+require conf/machine/include/qcom-common.inc
 require conf/machine/include/arm/arch-armv8a.inc
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-qcomlt"
-
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
     qrtr \
 "
-
-# Fastboot expects an ext4 image, which needs to be 4096 aligned
-IMAGE_FSTYPES ?= "ext4.gz"
-IMAGE_ROOTFS_ALIGNMENT = "4096"
-
-QCOM_BOOTIMG_KERNEL_BASE ?= "0x80000000"
-QCOM_BOOTIMG_PAGE_SIZE ?= "4096"
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/include/qcom-sdm845.inc b/conf/machine/include/qcom-sdm845.inc
index e3839b1..d197ca6 100644
--- a/conf/machine/include/qcom-sdm845.inc
+++ b/conf/machine/include/qcom-sdm845.inc
@@ -1,27 +1,7 @@
 SOC_FAMILY = "sdm845"
-require conf/machine/include/soc-family.inc
-require conf/machine/include/arm/arch-armv8a.inc
-
-XSERVER_OPENGL ?= " \
-    xf86-video-modesetting \
-    xserver-xorg-extension-glx \
-"
-
-XSERVER ?= " \
-    xserver-xorg \
-    xserver-xorg-module-libint10 \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${XSERVER_OPENGL}', 'xf86-video-fbdev', d)} \
-    xf86-input-evdev \
-    xf86-input-mouse \
-    xf86-input-keyboard \
-"
-
-PREFERRED_PROVIDER_virtual/egl ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-qcomlt"
+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 \
@@ -33,9 +13,3 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
 MACHINE_EXTRA_RRECOMMENDS += " \
     fastrpc \
 "
-
-IMAGE_FSTYPES ?= "ext4.gz"
-IMAGE_ROOTFS_ALIGNMENT = "4096"
-
-QCOM_BOOTIMG_KERNEL_BASE ?= "0x80000000"
-QCOM_BOOTIMG_PAGE_SIZE ?= "4096"
diff --git a/conf/machine/include/qcom-sdx55.inc b/conf/machine/include/qcom-sdx55.inc
new file mode 100644
index 0000000..67a9db0
--- /dev/null
+++ b/conf/machine/include/qcom-sdx55.inc
@@ -0,0 +1,12 @@
+SOC_FAMILY = "sdx55"
+require conf/machine/include/qcom-common.inc
+require conf/machine/include/arm/armv7a/tune-cortexa7.inc
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
+    qrtr \
+    rmtfs \
+"
+
+# UBI filesystem settings
+IMAGE_FSTYPES ?= "ubi"
+QCOM_BOOTIMG_PAGE_SIZE ?= "4096"
diff --git a/conf/machine/include/qcom-sm8250.inc b/conf/machine/include/qcom-sm8250.inc
new file mode 100644
index 0000000..c557147
--- /dev/null
+++ b/conf/machine/include/qcom-sm8250.inc
@@ -0,0 +1,15 @@
+SOC_FAMILY = "sm8250"
+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 \
+"