From 46cd5826f1f390b3f4a88b62c13dd8bf87b494d4 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sat, 30 Nov 2024 04:43:31 +0200 Subject: [PATCH 1/5] firmware-qcom-rb3gen2: drop Adreno-related bits Adreno firmware has been migrated to the linux-firmware. Corresponding packages were removed in the commit 81e498854e23 ("firmware-qcom-rb3gen2: migrate to linux-firmware"), however the recipe still downloads the archive. Drop the last bits related to Adreno firmware on this board. Signed-off-by: Dmitry Baryshkov --- recipes-bsp/firmware/firmware-qcom-rb3gen2_00039.2.bb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/recipes-bsp/firmware/firmware-qcom-rb3gen2_00039.2.bb b/recipes-bsp/firmware/firmware-qcom-rb3gen2_00039.2.bb index dbdede2c8..2a449396f 100644 --- a/recipes-bsp/firmware/firmware-qcom-rb3gen2_00039.2.bb +++ b/recipes-bsp/firmware/firmware-qcom-rb3gen2_00039.2.bb @@ -28,13 +28,9 @@ SRC_URI[license.sha256sum] = "be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433 FW_QCOM_NAME = "qcs6490" QCS6490_FW_SRC_PATH = "lib/firmware/qcom/qcs6490" -ADRENO_URI = "https://artifacts.codelinaro.org/artifactory/qli-ci/software/chip/qualcomm_linux-spf-1-0/qualcomm-linux-spf-1-0_test_device_public/r1.0_${PV}/le-qclinux-1-0-r1/apps_proc/prebuilt_HY22/adreno_1.0_qcm6490.tar.gz;fwpath=lib/firmware" -SRC_URI[adreno.sha256sum] = "efa9b263faef4e0891b2bc568f9ca18bab1c0e810311c764f0c59ebb5fb1ee39" - S = "${UNPACKDIR}" require recipes-bsp/firmware/firmware-qcom.inc -require recipes-bsp/firmware/firmware-qcom-adreno.inc do_compile:append() { pil-squasher wpss.mbn ${UNPACKDIR}/${FW_D_NAME}/${QCS6490_FW_SRC_PATH}/wpss.mdt From 9857a9ea2e11f7241bdc18cd98e4fa07d8d8a95a Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sat, 30 Nov 2024 05:20:11 +0200 Subject: [PATCH 2/5] firmware-ifc*: drop firmware for Inforce boards Support for Inforce boards is being migrated to meta-qcom-extras, drop support for those boards from this layer. Signed-off-by: Dmitry Baryshkov --- conf/machine/qcom-armv7a.conf | 1 - recipes-bsp/firmware/firmware-qcom-ifc6410.bb | 24 -------------- recipes-bsp/firmware/firmware-qcom-ifc6560.bb | 32 ------------------- .../initramfs-firmware-ifc6560-image.bb | 16 ---------- .../images/initramfs-firmware-image.bb | 4 --- .../images/initramfs-firmware-mega-image.bb | 6 ---- .../packagegroup-firmware-ifc6410.bb | 14 -------- .../packagegroup-firmware-ifc6560.bb | 14 -------- 8 files changed, 111 deletions(-) delete mode 100644 recipes-bsp/firmware/firmware-qcom-ifc6410.bb delete mode 100644 recipes-bsp/firmware/firmware-qcom-ifc6560.bb delete mode 100644 recipes-bsp/images/initramfs-firmware-ifc6560-image.bb delete mode 100644 recipes-bsp/packagegroups/packagegroup-firmware-ifc6410.bb delete mode 100644 recipes-bsp/packagegroups/packagegroup-firmware-ifc6560.bb diff --git a/conf/machine/qcom-armv7a.conf b/conf/machine/qcom-armv7a.conf index 6aeb442ac..89132e911 100644 --- a/conf/machine/qcom-armv7a.conf +++ b/conf/machine/qcom-armv7a.conf @@ -31,7 +31,6 @@ KERNEL_DEVICETREE ?= " \ 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 \ " SERIAL_CONSOLE ?= "115200 ttyMSM0" diff --git a/recipes-bsp/firmware/firmware-qcom-ifc6410.bb b/recipes-bsp/firmware/firmware-qcom-ifc6410.bb deleted file mode 100644 index 4d2ef7d9e..000000000 --- a/recipes-bsp/firmware/firmware-qcom-ifc6410.bb +++ /dev/null @@ -1,24 +0,0 @@ -# Specify location of the corresponding NON-HLOS.bin file by adding -# NHLOS_URI:pn-firmware-qcom-ifc6410 = "..." to local.conf. Use "file://" -# if the file is provided locally. - -DESCRIPTION = "QCOM Firmware for Inforce IFC6410 board" - -LICENSE = "CLOSED" - -# ifc6410 firmware is unsigned, so install into generic location -FW_QCOM_NAME = "apq8064" - -FW_QCOM_LIST = "dsps.mbn gss.mbn q6.mbn wcnss.mbn" - -S = "${UNPACKDIR}" - -require recipes-bsp/firmware/firmware-qcom.inc -require recipes-bsp/firmware/firmware-qcom-nhlos.inc - -SPLIT_FIRMWARE_PACKAGES = " \ - linux-firmware-qcom-${FW_QCOM_NAME}-dsps \ - linux-firmware-qcom-${FW_QCOM_NAME}-gss \ - linux-firmware-qcom-${FW_QCOM_NAME}-q6 \ - linux-firmware-qcom-${FW_QCOM_NAME}-wifi \ -" diff --git a/recipes-bsp/firmware/firmware-qcom-ifc6560.bb b/recipes-bsp/firmware/firmware-qcom-ifc6560.bb deleted file mode 100644 index 780116485..000000000 --- a/recipes-bsp/firmware/firmware-qcom-ifc6560.bb +++ /dev/null @@ -1,32 +0,0 @@ -# Specify location of the corresponding NON-HLOS.bin file by adding -# NHLOS_URI:pn-firmware-qcom-ifc6560 = "..." to local.conf. Use "file://" -# if the file is provided locally. - -DESCRIPTION = "QCOM Firmware for Inforce IFC6560 board" - -LICENSE = "CLOSED" - -# ifc6560 isn't locked, so install firmware into generic location -FW_QCOM_NAME = "sda660" - -FW_QCOM_LIST = "\ - a508_zap.mbn a512_zap.mbn \ - adsp.mbn \ - cdsp.mbn \ - mba.mbn modem.mbn modemuw.jsn \ - venus.mbn \ -" - -S = "${UNPACKDIR}" - -require recipes-bsp/firmware/firmware-qcom.inc -require recipes-bsp/firmware/firmware-qcom-nhlos.inc -require recipes-bsp/firmware/firmware-qcom-adreno.inc - -SPLIT_FIRMWARE_PACKAGES = "\ - linux-firmware-qcom-${FW_QCOM_NAME}-adreno \ - linux-firmware-qcom-${FW_QCOM_NAME}-audio \ - linux-firmware-qcom-${FW_QCOM_NAME}-compute \ - linux-firmware-qcom-${FW_QCOM_NAME}-modem \ - linux-firmware-qcom-${FW_QCOM_NAME}-venus \ -" diff --git a/recipes-bsp/images/initramfs-firmware-ifc6560-image.bb b/recipes-bsp/images/initramfs-firmware-ifc6560-image.bb deleted file mode 100644 index d4ad108bb..000000000 --- a/recipes-bsp/images/initramfs-firmware-ifc6560-image.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Tiny ramdisk image with all Nexus and Pixel devices firmware files" - -PACKAGE_INSTALL += " \ - packagegroup-firmware-ifc6560 \ -" - -BAD_RECOMMENDATIONS = "\ - linux-firmware-qcom-sda660-audio \ - linux-firmware-qcom-sda660-compute \ - linux-firmware-qcom-sda660-modem \ - linux-firmware-qcom-sda660-venus \ - linux-firmware-qca \ - linux-firmware-ath10k-wcn3990 \ -" - -require initramfs-firmware-image.inc diff --git a/recipes-bsp/images/initramfs-firmware-image.bb b/recipes-bsp/images/initramfs-firmware-image.bb index 6c0260991..17cece596 100644 --- a/recipes-bsp/images/initramfs-firmware-image.bb +++ b/recipes-bsp/images/initramfs-firmware-image.bb @@ -27,8 +27,4 @@ BAD_RECOMMENDATIONS = " \ hexagon-dsp-binaries-thundercomm-rb5-sdsp \ " -PACKAGE_INSTALL:qcom-armv7a = " \ - packagegroup-firmware-ifc6410 \ -" - require initramfs-firmware-image.inc diff --git a/recipes-bsp/images/initramfs-firmware-mega-image.bb b/recipes-bsp/images/initramfs-firmware-mega-image.bb index e4689896d..7ed4ec113 100644 --- a/recipes-bsp/images/initramfs-firmware-mega-image.bb +++ b/recipes-bsp/images/initramfs-firmware-mega-image.bb @@ -26,10 +26,4 @@ PACKAGE_INSTALL += " \ packagegroup-firmware-sm8650-hdk \ " -# Inforce / Penguin Edge devkits -PACKAGE_INSTALL += " \ - packagegroup-firmware-ifc6410 \ - packagegroup-firmware-ifc6560 \ -" - require initramfs-firmware-image.inc diff --git a/recipes-bsp/packagegroups/packagegroup-firmware-ifc6410.bb b/recipes-bsp/packagegroups/packagegroup-firmware-ifc6410.bb deleted file mode 100644 index 8b22ef8f0..000000000 --- a/recipes-bsp/packagegroups/packagegroup-firmware-ifc6410.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Firmware packages for the IFC6410 board" - -inherit packagegroup - -RRECOMMENDS:${PN} += " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a3xx', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath6k firmware-ath6kl', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-ar3k', '', d)} \ - firmware-qcom-ifc6410 \ - linux-firmware-qcom-apq8064-dsps \ - linux-firmware-qcom-apq8064-gss \ - linux-firmware-qcom-apq8064-q6 \ - linux-firmware-qcom-apq8064-wifi \ -" diff --git a/recipes-bsp/packagegroups/packagegroup-firmware-ifc6560.bb b/recipes-bsp/packagegroups/packagegroup-firmware-ifc6560.bb deleted file mode 100644 index 3dedd5662..000000000 --- a/recipes-bsp/packagegroups/packagegroup-firmware-ifc6560.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Firmware packages for the IFC6560 board" - -inherit packagegroup - -RRECOMMENDS:${PN} += " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a530 linux-firmware-qcom-sda660-adreno', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath10k-wcn3990', '', d)} \ - firmware-qcom-ifc6560 \ - linux-firmware-qcom-sda660-audio \ - linux-firmware-qcom-sda660-compute \ - linux-firmware-qcom-sda660-modem \ - linux-firmware-qcom-sda660-venus \ -" From 5d362d941428f221c0a1487e14479f5aeb477795 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sat, 30 Nov 2024 13:14:37 +0200 Subject: [PATCH 3/5] packagegroup-firmware-lenovo-x13s: drop recipe We are keeping only Qualcomm reference devices in meta-qcom, drop packagegroup for Lenovo X13s laptop. Signed-off-by: Dmitry Baryshkov --- .../packagegroup-firmware-lenovo-x13s.bb | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 recipes-bsp/packagegroups/packagegroup-firmware-lenovo-x13s.bb diff --git a/recipes-bsp/packagegroups/packagegroup-firmware-lenovo-x13s.bb b/recipes-bsp/packagegroups/packagegroup-firmware-lenovo-x13s.bb deleted file mode 100644 index dc6333222..000000000 --- a/recipes-bsp/packagegroups/packagegroup-firmware-lenovo-x13s.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Firmware packages for the Lenovo X13s laptop" - -inherit packagegroup - -RRECOMMENDS:${PN} += " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-sc8280xp-lenovo-x13s-adreno', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath11k', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca', '', d)} \ - linux-firmware-qcom-sc8280xp-lenovo-x13s-audio \ - linux-firmware-qcom-sc8280xp-lenovo-x13s-compute \ - linux-firmware-qcom-sc8280xp-lenovo-x13s-sensors \ -" From 4a04e03d1e1a9db9341eb782883dcaabda2fb8d3 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sat, 30 Nov 2024 13:48:59 +0200 Subject: [PATCH 4/5] qcom-firmware-mount: drop bbclass The bbclass wasn't in use for some time, time to drop it. It even wasn't updated for merged /usr systems. --- classes/qcom-firmware-mount.bbclass | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 classes/qcom-firmware-mount.bbclass diff --git a/classes/qcom-firmware-mount.bbclass b/classes/qcom-firmware-mount.bbclass deleted file mode 100644 index 9828b08e1..000000000 --- a/classes/qcom-firmware-mount.bbclass +++ /dev/null @@ -1,6 +0,0 @@ -qcom_mount_firmware() { - mkdir -p ${IMAGE_ROOTFS}/lib/firmware - echo "LABEL=qcom-firmware /lib/firmware ext4 defaults 0 0" >> ${IMAGE_ROOTFS}/etc/fstab -} - -ROOTFS_POSTPROCESS_COMMAND += "qcom_mount_firmware ; " From 05b73a175cfa710b38d8487998dd4fc3ecd2b13f Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sat, 30 Nov 2024 13:50:43 +0200 Subject: [PATCH 5/5] initramfs-qcom-image: remove the recipe and packagegroup The packagegroup-qcom-boot was created for old mainline kernels and hasn't been tested for several months. Drop non-generic jump-to-rootfs initramfs recipes. Signed-off-by: Dmitry Baryshkov --- recipes-kernel/images/initramfs-qcom-image.bb | 5 ----- .../packagegroups/packagegroup-qcom-boot.bb | 13 ------------- 2 files changed, 18 deletions(-) delete mode 100644 recipes-kernel/images/initramfs-qcom-image.bb delete mode 100644 recipes-kernel/packagegroups/packagegroup-qcom-boot.bb diff --git a/recipes-kernel/images/initramfs-qcom-image.bb b/recipes-kernel/images/initramfs-qcom-image.bb deleted file mode 100644 index 411a09606..000000000 --- a/recipes-kernel/images/initramfs-qcom-image.bb +++ /dev/null @@ -1,5 +0,0 @@ -require initramfs-rootfs-image.bb - -DESCRIPTION = "Ramdisk image for pivoting into rootfs extended to boot Qualcomm boards" - -PACKAGE_INSTALL += "packagegroup-qcom-boot" diff --git a/recipes-kernel/packagegroups/packagegroup-qcom-boot.bb b/recipes-kernel/packagegroups/packagegroup-qcom-boot.bb deleted file mode 100644 index 4e79bf66b..000000000 --- a/recipes-kernel/packagegroups/packagegroup-qcom-boot.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Qualcomm boot requirements" -DESCRIPTION = "A set of packages required to find the rootfs on the generic Qualcomm board" - -inherit packagegroup - -# Recommend the packages as some of them might end up being built-in -# qcom-pon is not strictly required, but it would be good to handle events if something goes wrong -RRECOMMENDS:${PN} = " \ - kernel-module-phy-qcom-qmp \ - kernel-module-qcom-pon \ - kernel-module-qnoc-sm8250 \ - kernel-module-ufs-qcom \ -"