20 files changed, 143 insertions, 318 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 9a4b081..0640b80 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -10,11 +10,13 @@ BBFILE_PATTERN_qcom := "^${LAYERDIR}/"
 BBFILE_PRIORITY_qcom = "5"
 
 LAYERDEPENDS_qcom = "core"
-LAYERSERIES_COMPAT_qcom = "honister"
+LAYERSERIES_COMPAT_qcom = "nanbield scarthgap"
 
 BBFILES_DYNAMIC += " \
     openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \
     openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \
     networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \
     networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \
+    meta-linux-mainline:${LAYERDIR}/dynamic-layers/meta-linux-mainline/*/*/*.bb \
+    meta-linux-mainline:${LAYERDIR}/dynamic-layers/meta-linux-mainline/*/*/*.bbappend \
 "
diff --git a/conf/machine/dragonboard-410c-32.conf b/conf/machine/dragonboard-410c-32.conf
deleted file mode 100644
index 930b12a..0000000
--- a/conf/machine/dragonboard-410c-32.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-#@TYPE: Machine
-#@NAME: dragonboard-410c-32
-#@DESCRIPTION: 32-bit machine configuration for the DragonBoard 410c (96boards), with Qualcomm Snapdragon 410 APQ8016.
-
-require conf/machine/include/qcom-apq8016.inc
-require conf/machine/include/arm/armv7a/tune-cortexa8.inc
-
-MACHINE_FEATURES = "usbhost usbgadget alsa screen wifi bluetooth ext2"
-
-SERIAL_CONSOLE ?= "115200 ttyMSM0"
-
-# Building 32-bit kernel is not supported.
-PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
-RDEPENDS:kernel-base = ""
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5-noinst-tools', '', d)} \
-    firmware-qcom-dragonboard410c \
-"
diff --git a/conf/machine/dragonboard-410c.conf b/conf/machine/dragonboard-410c.conf
deleted file mode 100644
index 7629a8d..0000000
--- a/conf/machine/dragonboard-410c.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-#@TYPE: Machine
-#@NAME: dragonboard-410c
-#@DESCRIPTION: Machine configuration for the DragonBoard 410c (96boards), with Qualcomm Snapdragon 410 APQ8016.
-
-require conf/machine/include/qcom-apq8016.inc
-require conf/machine/include/arm/armv8a/tune-cortexa53.inc
-
-MACHINE_FEATURES = "usbhost usbgadget alsa screen wifi bluetooth ext2"
-
-KERNEL_IMAGETYPE ?= "Image.gz"
-KERNEL_DEVICETREE ?= "qcom/apq8016-sbc.dtb"
-
-SERIAL_CONSOLE ?= "115200 ttyMSM0"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
-    kernel-modules \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a3xx mesa-driver-msm', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5-noinst-tools', '', d)} \
-    firmware-qcom-dragonboard410c \
-    linux-firmware-qcom-venus-1.8 \
-"
-
-QCOM_BOOTIMG_ROOTFS ?= "/dev/mmcblk0p14"
-
-# Define rootfs partiton (kernel argument)
-SD_QCOM_BOOTIMG_ROOTFS ?= "/dev/mmcblk1p7"
-
-UBOOT_MACHINE ?= "dragonboard410c_defconfig"
-
-# Assemble SD card
-IMAGE_FSTYPES += "wic.gz wic.bmap"
-WKS_FILE = "dragonboard410c-sd.wks"
-WKS_FILE_DEPENDS = "firmware-qcom-dragonboard410c-bootloader-sdcard"
diff --git a/conf/machine/dragonboard-820c.conf b/conf/machine/dragonboard-820c.conf
deleted file mode 100644
index 6d4a2c4..0000000
--- a/conf/machine/dragonboard-820c.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-#@TYPE: Machine
-#@NAME: dragonboard-820c
-#@DESCRIPTION: Machine configuration for the DragonBoard 820c (96boards), with Qualcomm Snapdragon 820 APQ8096.
-
-require conf/machine/include/qcom-apq8096.inc
-
-MACHINE_FEATURES = "usbhost usbgadget alsa screen wifi bluetooth ext2"
-
-KERNEL_IMAGETYPE ?= "Image.gz"
-KERNEL_DEVICETREE ?= "qcom/apq8096-db820c.dtb"
-
-SERIAL_CONSOLE ?= "115200 ttyMSM0"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
-    firmware-qcom-dragonboard820c \
-    kernel-modules \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a530 mesa-driver-msm', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath10k', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca', '', d)} \
-    linux-firmware-qcom-venus-4.2 \
-"
-
-QCOM_BOOTIMG_ROOTFS ?= "/dev/sda1"
-
-UBOOT_MACHINE ?= "dragonboard820c_defconfig"
-
-# UFS partitions setup with 4096 logical sector size
-EXTRA_IMAGECMD:ext4 += " -b 4096 "
diff --git a/conf/machine/dragonboard-845c.conf b/conf/machine/dragonboard-845c.conf
deleted file mode 100644
index b6b6da4..0000000
--- a/conf/machine/dragonboard-845c.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-#@TYPE: Machine
-#@NAME: dragonboard-845c
-#@DESCRIPTION: Machine configuration for the DragonBoard 845c (96boards), with Qualcomm Snapdragon 845 SDM845.
-
-require conf/machine/include/qcom-sdm845.inc
-
-MACHINE_FEATURES = "usbhost usbgadget alsa screen wifi bluetooth ext2"
-
-KERNEL_IMAGETYPE ?= "Image.gz"
-KERNEL_DEVICETREE ?= "qcom/sdm845-db845c.dtb"
-KERNEL_CMDLINE_EXTRA ?= "clk_ignore_unused pd_ignore_unused"
-
-SERIAL_CONSOLE ?= "115200 ttyMSM0"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
-    firmware-qcom-dragonboard845c \
-    kernel-modules \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath10k linux-firmware-qcom-sdm845-modem', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca linux-firmware-qcom-sdm845-modem', '', d)} \
-    linux-firmware-qcom-sdm845-audio \
-    linux-firmware-qcom-sdm845-compute \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a630 mesa-driver-msm', '', d)} \
-    linux-firmware-qcom-venus-5.2 \
-"
-
-# /dev/sda1 is 'rootfs' partition after installing the latest bootloader package from linaro
-QCOM_BOOTIMG_ROOTFS ?= "/dev/sda1"
-
-# UFS partitions setup with 4096 logical sector size
-EXTRA_IMAGECMD:ext4 += " -b 4096 "
diff --git a/conf/machine/evb4k-qcs404.conf b/conf/machine/evb4k-qcs404.conf
deleted file mode 100644
index 59b12af..0000000
--- a/conf/machine/evb4k-qcs404.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: evb4k-qcs404
-#@DESCRIPTION: Machine configuration for the EVB-4K QCS404 with Qualcomm QCS404.
-
-require conf/machine/include/qcom-qcs404.inc
-require conf/machine/include/arm/armv8a/tune-cortexa53.inc
-
-MACHINE_FEATURES = "usbhost usbgadget ext2"
-
-KERNEL_IMAGETYPE ?= "Image.gz"
-KERNEL_DEVICETREE ?= "qcom/qcs404-evb-4000.dtb"
-
-SERIAL_CONSOLE ?= "115200 ttyMSM0"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
-    kernel-modules \
-"
-
-QCOM_BOOTIMG_ROOTFS ?= "/dev/mmcblk0p27"
diff --git a/conf/machine/ifc6410.conf b/conf/machine/ifc6410.conf
deleted file mode 100644
index e0cffcf..0000000
--- a/conf/machine/ifc6410.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-#@TYPE: Machine
-#@NAME: ifc6410
-#@DESCRIPTION: Machine configuration for the Inforce IFC6410, with Qualcomm Snapdragon 600 APQ8064.
-
-require conf/machine/include/qcom-apq8064.inc
-
-# features
-MACHINE_FEATURES = "alsa kernel26 screen usb keyboard wifi ext2 ext3"
-
-MACHINE_EXTRA_RRECOMMENDS = " \
-    kernel-modules \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \
-"
-
-KERNEL_IMAGETYPE ?= "zImage"
-KERNEL_DEVICETREE ?= "qcom-apq8064-ifc6410.dtb"
-
-SERIAL_CONSOLE ?= "115200 ttyMSM0"
-
-QCOM_BOOTIMG_ROOTFS ?= "/dev/mmcblk0p12"
-
-INHERIT += "qcom-firmware-mount"
diff --git a/conf/machine/include/qcom-apq8016.inc b/conf/machine/include/qcom-apq8016.inc
index a073ae7..5414a7a 100644
--- a/conf/machine/include/qcom-apq8016.inc
+++ b/conf/machine/include/qcom-apq8016.inc
@@ -1,5 +1,6 @@
 SOC_FAMILY = "apq8016"
 require conf/machine/include/qcom-common.inc
+require conf/machine/include/arm/armv8a/tune-cortexa53.inc
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
     qrtr \
diff --git a/conf/machine/include/qcom-apq8064.inc b/conf/machine/include/qcom-apq8064.inc
index 723be98..e2f0c25 100644
--- a/conf/machine/include/qcom-apq8064.inc
+++ b/conf/machine/include/qcom-apq8064.inc
@@ -1,6 +1,7 @@
 SOC_FAMILY = "apq8064"
 require conf/machine/include/qcom-common.inc
-require conf/machine/include/arm/armv7a/tune-cortexa8.inc
+DEFAULTTUNE = "cortexa15thf-neon-vfpv4"
+require conf/machine/include/arm/armv7a/tune-cortexa15.inc
 
 # 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 8038091..ea875b0 100644
--- a/conf/machine/include/qcom-apq8096.inc
+++ b/conf/machine/include/qcom-apq8096.inc
@@ -1,5 +1,6 @@
 SOC_FAMILY = "apq8096"
 require conf/machine/include/qcom-common.inc
+DEFAULTTUNE = "armv8a-crc-crypto"
 require conf/machine/include/arm/arch-armv8a.inc
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
diff --git a/conf/machine/include/qcom-common.inc b/conf/machine/include/qcom-common.inc
index 4243f6a..da57da8 100644
--- a/conf/machine/include/qcom-common.inc
+++ b/conf/machine/include/qcom-common.inc
@@ -11,8 +11,6 @@ XSERVER ?= " \
     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"
@@ -20,7 +18,7 @@ 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_virtual/kernel ??= "linux-linaro-qcomlt"
 
 PREFERRED_PROVIDER_android-tools-conf = "android-tools-conf-configfs"
 
@@ -34,3 +32,26 @@ 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/nexus7-2013.conf b/conf/machine/nexus7-2013.conf
deleted file mode 100644
index 14be8b2..0000000
--- a/conf/machine/nexus7-2013.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#@TYPE: Machine
-#@NAME: Nexus 7 2013
-#@DESCRIPTION: 32-bit machine configuration for the Asus Google Nexus 7 2013, with Qualcomm Snapdragon S4 Pro (APQ8064).
-
-require conf/machine/include/qcom-apq8064.inc
-
-MACHINE_FEATURES = "alsa screen wifi bluetooth ext2 ext3 usb usbhost usbgadget"
-
-KERNEL_IMAGETYPE ?= "zImage"
-KERNEL_DEVICETREE ?= "qcom-apq8064-asus-nexus7-flo.dtb"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \
-"
-
-SERIAL_CONSOLE ?= "115200 ttyMSM0"
-
-QCOM_BOOTIMG_ROOTFS ?= "PARTLABEL=userdata"
diff --git a/conf/machine/qcom-armv7a-modem.conf b/conf/machine/qcom-armv7a-modem.conf
new file mode 100644
index 0000000..caa7f2b
--- /dev/null
+++ b/conf/machine/qcom-armv7a-modem.conf
@@ -0,0 +1,37 @@
+#@TYPE: Machine
+#@NAME: Qualcomm SDX/MDM devices
+#@DESCRIPTION: Machine configuration for various Qualcomm SDX and MDM based boards
+
+require conf/machine/include/qcom-common.inc
+# MDM9615 is Cortex-A5 + VFP4, so it should be compatible
+require conf/machine/include/arm/armv7a/tune-cortexa7.inc
+
+MACHINE_FEATURES = "usbhost usbgadget"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
+    qrtr \
+    rmtfs \
+"
+
+KERNEL_IMAGETYPE ?= "zImage"
+KERNEL_DEVICETREE ?= " \
+    qcom/qcom-mdm9615-wp8548-mangoh-green.dtb \
+    qcom/qcom-sdx55-mtp.dtb \
+    qcom/qcom-sdx55-t55.dtb \
+    qcom/qcom-sdx55-telit-fn980-tlb.dtb \
+    qcom/qcom-sdx65-mtp.dtb \
+"
+
+SERIAL_CONSOLES[qcom-sdx55-telit-fn980-tlb] = "921600;ttyMSM0"
+
+# UBI filesystem settings
+IMAGE_FSTYPES ?= "ubi"
+QCOM_BOOTIMG_PAGE_SIZE ?= "4096"
+
+# UBI filesystem parameters
+MKUBIFS_ARGS ?= "-m 4096 -e 253952 -c 1188"
+UBINIZE_ARGS ?= "-m 4096 -p 256KiB -s 4096"
+
+# Use system partition for rootfs
+UBI_VOLNAME ?= "system"
+QCOM_BOOTIMG_ROOTFS ?= "ubi0:system"
diff --git a/conf/machine/qcom-armv7a.conf b/conf/machine/qcom-armv7a.conf
new file mode 100644
index 0000000..d8cb92f
--- /dev/null
+++ b/conf/machine/qcom-armv7a.conf
@@ -0,0 +1,40 @@
+#@TYPE: Machine
+#@NAME: Qualcomm Snapdragon ARMv7-a (with Krait cores)
+#@DESCRIPTION: Unified 32-bit machine configuration for the devices with Qualcomm Snapdragon ARMv7-a based CPUs (S4 and later)
+#
+# Note: This machine targets Snapdragon S4 Plus/Pro/Prime and early (32-bit
+# ARM) models of Snapdragon 400/600/800 series SoCs.  It will most probably
+# work on Snapdragon S4 (MSM8x25, Cortex-A5 with VFPv4) or on 32-bit IPQ SoCs
+#
+# Do not use this machine for SDXnn modems or for Snapdragon S1/S2/S3.
+
+require conf/machine/include/qcom-common.inc
+
+# Krait is not Cortex-A15, but its features are close enough
+DEFAULTTUNE = "cortexa15thf-neon-vfpv4"
+require conf/machine/include/arm/armv7a/tune-cortexa15.inc
+
+# Android boot image settings
+QCOM_BOOTIMG_PAGE_SIZE = "2048"
+
+MACHINE_FEATURES = "alsa screen alsa bluetooth ext2 ext3 opengl usb usbhost usbgadget"
+
+KERNEL_IMAGETYPE ?= "zImage"
+KERNEL_DEVICETREE ?= " \
+    qcom/qcom-apq8064-asus-nexus7-flo.dtb \
+    qcom/qcom-apq8064-ifc6410.dtb \
+    qcom/qcom-apq8074-dragonboard.dtb \
+    qcom/qcom-apq8084-ifc6540.dtb \
+    qcom/qcom-msm8974-lge-nexus5-hammerhead.dtb \
+"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'wireless-regdb-static', '', d)} \
+    packagegroup-firmware-ifc6410 \
+    firmware-qcom-nexus7-2013 \
+"
+
+SERIAL_CONSOLE ?= "115200 ttyMSM0"
+
+QCOM_BOOTIMG_ROOTFS ?= "PARTLABEL=userdata"
diff --git a/conf/machine/qcom-armv8a.conf b/conf/machine/qcom-armv8a.conf
index a7545ee..848f959 100644
--- a/conf/machine/qcom-armv8a.conf
+++ b/conf/machine/qcom-armv8a.conf
@@ -6,16 +6,37 @@ MACHINE_FEATURES = "usbhost usbgadget alsa screen wifi bluetooth ext2"
 # UFS partitions in 820/845/RB5 setup with 4096 logical sector size
 EXTRA_IMAGECMD:ext4 += " -b 4096 "
 
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+
 # Support for dragonboard{410, 820, 845}c, rb5
 KERNEL_IMAGETYPE ?= "Image.gz"
 SERIAL_CONSOLE ?= "115200 ttyMSM0"
-KERNEL_DEVICETREE ?= "qcom/apq8016-sbc.dtb qcom/apq8096-db820c.dtb qcom/sdm845-db845c.dtb qcom/qrb5165-rb5.dtb qcom/sm8250-rb5-dvt.dtb"
+KERNEL_DEVICETREE ?= " \
+    qcom/apq8016-sbc.dtb \
+    qcom/apq8096-db820c.dtb \
+    qcom/sdm845-db845c.dtb \
+    qcom/qcs404-evb-4000.dtb \
+    qcom/qrb2210-rb1.dtb \
+    qcom/qrb4210-rb2.dtb \
+    qcom/qrb5165-rb5.dtb \
+    qcom/sm8450-hdk.dtb \
+"
+
+# These DT are not upstreamed (yet) and currenty exist only as a patches against linux-yocto
+KERNEL_DEVICETREE:append:pn-linux-yocto = " \
+    qcom/qcm6490-idp.dtb \
+    qcom/qcs6490-rb3gen2.dtb \
+"
 
-QCOM_BOOTIMG_PAGE_SIZE[apq8016-sbc] = "2048"
-QCOM_BOOTIMG_ROOTFS = "/dev/sda1"
-QCOM_BOOTIMG_ROOTFS[apq8016-sbc] = "/dev/mmcblk0p14"
-SD_QCOM_BOOTIMG_ROOTFS[apq8016-sbc] = "/dev/mmcblk1p7"
-KERNEL_CMDLINE_EXTRA[sdm845-db845c] = "clk_ignore_unused pd_ignore_unused"
+QCOM_BOOTIMG_PAGE_SIZE[apq8016-sbc] ?= "2048"
+QCOM_BOOTIMG_ROOTFS ?= "/dev/sda1"
+QCOM_BOOTIMG_ROOTFS[apq8016-sbc] ?= "/dev/mmcblk0p14"
+QCOM_BOOTIMG_ROOTFS[sm8450-hdk] ?= "PARTLABEL=userdata"
+QCOM_BOOTIMG_ROOTFS[qcs404-evb-4000] ?= "/dev/mmcblk0p27"
+QCOM_BOOTIMG_ROOTFS[qrb2210-rb1] ?= "PARTLABEL=userdata"
+QCOM_BOOTIMG_ROOTFS[qrb4210-rb2] ?= "PARTLABEL=userdata"
+SD_QCOM_BOOTIMG_ROOTFS[apq8016-sbc] ?= "/dev/mmcblk1p7"
+KERNEL_CMDLINE_EXTRA[sdm845-db845c] ?= "clk_ignore_unused pd_ignore_unused"
 
 # Userspace tools
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
@@ -32,19 +53,12 @@ MACHINE_EXTRA_RRECOMMENDS += " \
 # Modules and firmware for all supported machines
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
     kernel-modules \
-    firmware-qcom-dragonboard410c \
-    firmware-qcom-dragonboard820c \
-    firmware-qcom-dragonboard845c \
-    firmware-qcom-rb5 \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath10k linux-firmware-ath11k linux-firmware-qcom-sdm845-modem wireless-regdb-static', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca linux-firmware-qcom-sdm845-modem', '', d)} \
-    linux-firmware-qcom-sdm845-audio \
-    linux-firmware-qcom-sdm845-compute \
-    linux-firmware-qcom-sm8250-audio \
-    linux-firmware-qcom-sm8250-compute \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a3xx linux-firmware-qcom-adreno-a530 linux-firmware-qcom-adreno-a630 linux-firmware-qcom-adreno-a650', '', d)} \
-    linux-firmware-qcom-venus-1.8 \
-    linux-firmware-qcom-venus-4.2 \
-    linux-firmware-qcom-venus-5.2 \
-    linux-firmware-qcom-vpu-1.0 \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'wireless-regdb-static', '', d)} \
+    packagegroup-firmware-dragonboard410c \
+    packagegroup-firmware-dragonboard820c \
+    packagegroup-firmware-dragonboard845c \
+    packagegroup-firmware-rb1 \
+    packagegroup-firmware-rb2 \
+    packagegroup-firmware-rb5 \
 "
diff --git a/conf/machine/qrb5165-rb5.conf b/conf/machine/qrb5165-rb5.conf
deleted file mode 100644
index 5c3a5f6..0000000
--- a/conf/machine/qrb5165-rb5.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-#@TYPE: Machine
-#@NAME: RB5 Robotics platform
-#@DESCRIPTION: Machine configuration for the RB5 development board, with Qualcomm Snapdragon 865 QRB5165.
-
-require conf/machine/include/qcom-sm8250.inc
-
-MACHINE_FEATURES = "usbhost usbgadget alsa screen wifi bluetooth ext2"
-
-KERNEL_IMAGETYPE ?= "Image.gz"
-KERNEL_DEVICETREE ?= "qcom/qrb5165-rb5.dtb qcom/sm8250-rb5-dvt.dtb"
-KERNEL_CMDLINE_EXTRA ?= "pcie_pme=nomsi"
-
-SERIAL_CONSOLE ?= "115200 ttyMSM0"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
-    kernel-modules \
-    firmware-qcom-rb5 linux-firmware-lt9611uxc \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath11k wireless-regdb-static', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca', '', d)} \
-    linux-firmware-qcom-sm8250-audio \
-    linux-firmware-qcom-sm8250-compute \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a650 mesa-driver-msm', '', d)} \
-    linux-firmware-qcom-vpu-1.0 \
-"
-
-# /dev/sda1 is 'rootfs' partition after installing the latest bootloader package from linaro
-QCOM_BOOTIMG_ROOTFS ?= "/dev/sda1"
-
-# UFS partitions setup with 4096 logical sector size
-EXTRA_IMAGECMD:ext4 += " -b 4096 "
diff --git a/conf/machine/sa8155p-adp.conf b/conf/machine/sa8155p-adp.conf
deleted file mode 100644
index d1f9288..0000000
--- a/conf/machine/sa8155p-adp.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-#@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
-
-# Set INITRAMFS_IMAGE for sa8155p machine
-INITRAMFS_IMAGE = "initramfs-kerneltest-full-image"
-
-MACHINE_FEATURES = "usbhost usbgadget ext2"
-
-KERNEL_IMAGETYPE ?= "Image.gz"
-KERNEL_DEVICETREE ?= "qcom/sa8155p-adp.dtb"
-
-SERIAL_CONSOLE ?= "115200 ttyMSM0"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
-    kernel-modules \
-"
-
-# /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 "
diff --git a/conf/machine/sdx55-mtp.conf b/conf/machine/sdx55-mtp.conf
deleted file mode 100644
index b37278b..0000000
--- a/conf/machine/sdx55-mtp.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-#@TYPE: Machine
-#@NAME: SDX55-MTP
-#@DESCRIPTION: Machine configuration for the SDX55-MTP development board, with Qualcomm SDX55.
-
-require conf/machine/include/qcom-sdx55.inc
-
-MACHINE_FEATURES = "usbhost usbgadget"
-
-KERNEL_IMAGETYPE ?= "zImage"
-KERNEL_DEVICETREE ?= "qcom-sdx55-mtp.dtb"
-
-# UBI filesystem parameters
-MKUBIFS_ARGS ?= "-m 4096 -e 253952 -c 1188"
-UBINIZE_ARGS ?= "-m 4096 -p 256KiB -s 4096"
-
-# Use system partition for rootfs
-UBI_VOLNAME ?= "system"
-QCOM_BOOTIMG_ROOTFS ?= "ubi0:system"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-linaro-qcomlt-dev"
diff --git a/conf/machine/sdx55-telit-fn980.conf b/conf/machine/sdx55-telit-fn980.conf
deleted file mode 100644
index f9cbf2e..0000000
--- a/conf/machine/sdx55-telit-fn980.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-#@TYPE: Machine
-#@NAME: SDX55-TELIT-FN980
-#@DESCRIPTION: Machine configuration for the Telit FN980 development board, with Qualcomm SDX55.
-
-require conf/machine/include/qcom-sdx55.inc
-
-MACHINE_FEATURES = "usbhost usbgadget"
-
-KERNEL_IMAGETYPE ?= "zImage"
-KERNEL_DEVICETREE ?= "qcom-sdx55-telit-fn980.dtb"
-
-# UBI filesystem parameters
-MKUBIFS_ARGS ?= "-m 4096 -e 253952 -c 528"
-UBINIZE_ARGS ?= "-m 4096 -p 256KiB -s 4096"
-
-# Use system partition for rootfs
-UBI_VOLNAME ?= "system"
-QCOM_BOOTIMG_ROOTFS ?= "ubi0:system"
-
-SERIAL_CONSOLES = "921600;ttyMSM0"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-linaro-qcomlt-dev"
diff --git a/conf/machine/sm8250-mtp.conf b/conf/machine/sm8250-mtp.conf
deleted file mode 100644
index 8d9f15e..0000000
--- a/conf/machine/sm8250-mtp.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-#@TYPE: Machine
-#@NAME: SM8250-MTP
-#@DESCRIPTION: Machine configuration for the SM8250-MTP development board, with Qualcomm Snapdragon 865 SM8250.
-
-require conf/machine/include/qcom-sm8250.inc
-
-MACHINE_FEATURES = "usbhost usbgadget alsa screen wifi bluetooth ext2"
-
-KERNEL_IMAGETYPE ?= "Image.gz"
-KERNEL_DEVICETREE ?= "qcom/sm8250-mtp.dtb"
-
-SERIAL_CONSOLE ?= "115200 ttyMSM0"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
-    kernel-modules \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \
-"
-# linux-firmware-qcom-adreno-a650 
-
-# /dev/sda15 is 'userdata' partition, so wipe it and use for our build
-QCOM_BOOTIMG_ROOTFS ?= "/dev/sda15"
-
-# UFS partitions setup with 4096 logical sector size
-EXTRA_IMAGECMD:ext4 += " -b 4096 "