From 5413441473c4c4b9bb36ce1c50821722d04f8d05 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Thu, 2 Nov 2023 18:41:35 +0300 Subject: [PATCH] conf: drop individual boards support Drop all the individual 64-bit boards support. Leave only the generic qcom-armv8a machine (which should be used instead) and the 32-bit devices. Signed-off-by: Dmitry Baryshkov --- README.md | 6 ++++++ conf/machine/dragonboard-410c.conf | 31 ------------------------------ conf/machine/dragonboard-820c.conf | 26 ------------------------- conf/machine/dragonboard-845c.conf | 25 ------------------------ conf/machine/evb4k-qcs404.conf | 19 ------------------ conf/machine/qrb5165-rb5.conf | 26 ------------------------- conf/machine/sa8155p-adp.conf | 24 ----------------------- conf/machine/sm8250-mtp.conf | 25 ------------------------ 8 files changed, 6 insertions(+), 176 deletions(-) delete mode 100644 conf/machine/dragonboard-410c.conf delete mode 100644 conf/machine/dragonboard-820c.conf delete mode 100644 conf/machine/dragonboard-845c.conf delete mode 100644 conf/machine/evb4k-qcs404.conf delete mode 100644 conf/machine/qrb5165-rb5.conf delete mode 100644 conf/machine/sa8155p-adp.conf delete mode 100644 conf/machine/sm8250-mtp.conf diff --git a/README.md b/README.md index f2153953a..120439d47 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,12 @@ in the build (e.g. it is used in BBLAYERS) then additional recipes from meta-qcom are added to the metadata. You can refer to meta-qcom/conf/layer.conf for the implementation details. +## Device support + +All contemporary boards are supported by a single qcom-armv8a machine. Please +use it instead of using the per-board configuration file. In order to enable +support for the particular device extend the qcom-armv8a.conf file . + ## Contributing If you want to contribute changes, you can send Github pull requests at diff --git a/conf/machine/dragonboard-410c.conf b/conf/machine/dragonboard-410c.conf deleted file mode 100644 index ca16d4179..000000000 --- a/conf/machine/dragonboard-410c.conf +++ /dev/null @@ -1,31 +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 - -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', 'mesa-driver-msm', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5-noinst-tools', '', d)} \ - packagegroup-firmware-dragonboard410c \ -" - -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 4f9dd5dfb..000000000 --- a/conf/machine/dragonboard-820c.conf +++ /dev/null @@ -1,26 +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 += " \ - kernel-modules \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \ - packagegroup-firmware-dragonboard820c \ -" - -QCOM_BOOTIMG_ROOTFS ?= "/dev/sda1" -KERNEL_CMDLINE_EXTRA = "maxcpus=2" - -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 d78ce43f8..000000000 --- a/conf/machine/dragonboard-845c.conf +++ /dev/null @@ -1,25 +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 += " \ - kernel-modules \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \ - packagegroup-firmware-dragonboard845c \ -" - -# /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 59b12af9d..000000000 --- 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/qrb5165-rb5.conf b/conf/machine/qrb5165-rb5.conf deleted file mode 100644 index d541b0bd1..000000000 --- a/conf/machine/qrb5165-rb5.conf +++ /dev/null @@ -1,26 +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" -KERNEL_CMDLINE_EXTRA ?= "pcie_pme=nomsi" - -SERIAL_CONSOLE ?= "115200 ttyMSM0" - -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \ - kernel-modules \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \ - packagegroup-firmware-rb5 \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'wireless-regdb-static', '', d)} \ -" - -# /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 9c5f83ccc..000000000 --- a/conf/machine/sa8155p-adp.conf +++ /dev/null @@ -1,24 +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 - -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 'system' partition for adp board, but its very small, so we -# use 'userdata' partition here. -# /dev/sda9 is 'userdata' partition for adp board, so wipe it and use for our build -QCOM_BOOTIMG_ROOTFS ?= "/dev/sda9" - -# UFS partitions setup with 4096 logical sector size -EXTRA_IMAGECMD:ext4 += " -b 4096 " diff --git a/conf/machine/sm8250-mtp.conf b/conf/machine/sm8250-mtp.conf deleted file mode 100644 index 8d9f15e79..000000000 --- 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 "