Merge pull request #538 from lumag/fix-fw

Drop firmware files now supported by the linux-firmware recipe
Linaro · Nov 6, 2023 · 1036569 · 1036569
2 parents 85e8d59 + a11a41e
commit 1036569
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 110 deletions.
diff --git a/recipes-bsp/firmware/firmware-qcom-dragonboard410c.inc b/recipes-bsp/firmware/firmware-qcom-dragonboard410c.inc
@@ -3,8 +3,6 @@ DESCRIPTION = "QCOM Firmware for DragonBoard 410c"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4d087ee0965cb059f1b2f9429e166f64"
 
-RRECOMMENDS_${PN} = "linux-firmware-qcom-apq8016-modem linux-firmware-qcom-apq8016-wifi"
-
 FW_QCOM_NAME = "apq8016"
 
 require recipes-bsp/firmware/firmware-qcom.inc
@@ -16,19 +14,4 @@ do_install() {
 
     install -d ${D}${sysconfdir}/
     install -m 0644 LICENSE ${D}${sysconfdir}/QCOM-LINUX-BOARD-SUPPORT-LICENSE-${PN}
-
-    # compat for Linux kernel <= 5.15
-    install -d ${D}${nonarch_base_libdir}/firmware/wlan/prima
-    install -m 0644 ./proprietary-linux/wlan/prima/WCNSS_qcom_wlan_nv.bin \
-                 ${D}${nonarch_base_libdir}/firmware/wlan/prima/
-
-    install -d ${D}${FW_QCOM_BASE_PATH}/msm8916
-    for file in modem.mbn mba.mbn wcnss.mbn
-    do
-        ln -s ../apq8016/$file ${D}${FW_QCOM_BASE_PATH}/msm8916/$file
-    done
-    for file in modem.mdt wcnss.mdt
-    do
-        ln -s ../apq8016/`basename $file .mdt`.mbn ${D}${FW_QCOM_BASE_PATH}/msm8916/$file
-    done
 }
diff --git a/recipes-bsp/firmware/firmware-qcom-dragonboard820c_01700.1.bb b/recipes-bsp/firmware/firmware-qcom-dragonboard820c_01700.1.bb
@@ -17,27 +17,12 @@ do_install() {
     install -d ${D}${nonarch_base_libdir}/firmware/
     install -d ${D}${FW_QCOM_PATH}/
 
-    # Install only split parts, squashed images and .jsn are now part of linux-firmware
-    install -m 0444 ./proprietary-linux/adsp.mdt ${D}${FW_QCOM_PATH}/
-    install -m 0444 ./proprietary-linux/adsp.b* ${D}${FW_QCOM_PATH}/
-
     install -m 0444 ./bootloaders-linux/adspso.bin ${D}${FW_QCOM_PATH}/
 
     install -d ${D}${sysconfdir}/
     install -m 0644 LICENSE ${D}${sysconfdir}/QCOM-LINUX-BOARD-SUPPORT-LICENSE-${PN}
-
-    # compat for Linux kernel <= 5.15
-    install -d ${D}${FW_QCOM_BASE_PATH}/msm8996
-    for file in adsp.mbn adspr.jsn adspua.jsn ${D}${FW_QCOM_PATH}/*.mdt ${D}${FW_QCOM_PATH}/*.b*
-    do
-        ln -s ../apq8096/$(basename $file) ${D}${FW_QCOM_BASE_PATH}/msm8996/
-    done
 }
 
 SPLIT_FIRMWARE_PACKAGES = " \
     ${PN}-dspso \
-    linux-firmware-qcom-${FW_QCOM_NAME}-audio-split \
-    ${PN}-split \
 "
-
-FILES:${PN}-split = "${FW_QCOM_BASE_PATH}/msm8996/*.mdt ${FW_QCOM_BASE_PATH}/msm8996/*.b*"
diff --git a/recipes-bsp/firmware/firmware-qcom-dragonboard845c_20190529180356-v4.bb b/recipes-bsp/firmware/firmware-qcom-dragonboard845c_20190529180356-v4.bb
@@ -20,26 +20,11 @@ do_install() {
     install -m 0444 ./08-dspso/dspso.bin ${D}${FW_QCOM_PATH}
 
     install -m 0444 ./17-USB3-201-202-FW/K2026090.mem ${D}${nonarch_base_libdir}/firmware/renesas_usb_fw.mem
-    install -m 0444 ./18-adreno-fw/a630_zap*.* ${D}${nonarch_base_libdir}/firmware/qcom/
-    install -m 0444 ./20-adsp_split/firmware/adsp*.* ${D}${FW_QCOM_PATH}
-    install -m 0444 ./21-cdsp_split/firmware/cdsp*.* ${D}${FW_QCOM_PATH}
-
-    install -m 0444 ./39-jsn/slpi*.jsn  ${D}${FW_QCOM_PATH}
-
-    pil-squasher ${D}${FW_QCOM_PATH}/slpi.mbn \
-                 ./30-slpi_split/slpi.mdt
 
     install -d ${D}${sysconfdir}/
     install -m 0644 LICENSE.qcom.txt ${D}${sysconfdir}/QCOM-LINUX-BOARD-SUPPORT-LICENSE-${PN}
 }
 
 SPLIT_FIRMWARE_PACKAGES = " \
     ${PN}-dspso \
-    linux-firmware-qcom-adreno-a630-split \
-    linux-firmware-qcom-${FW_QCOM_NAME}-audio-split \
-    linux-firmware-qcom-${FW_QCOM_NAME}-compute-split \
-    linux-firmware-qcom-${FW_QCOM_NAME}-modem-split \
-    linux-firmware-qcom-${FW_QCOM_NAME}-sensors \
 "
-
-FILES:linux-firmware-qcom-adreno-a630-split = "${FW_QCOM_BASE_PATH}/a630_zap.*"
diff --git a/recipes-bsp/firmware/firmware-qcom-rb1_20230823-v2.bb b/recipes-bsp/firmware/firmware-qcom-rb1_20230823-v2.bb
@@ -7,52 +7,19 @@ SRC_URI = "http://releases.linaro.org/96boards/rb1/qualcomm/firmware/RB1_firmwar
 SRC_URI[md5sum] = "db892ca115845938c6672d756448d512"
 SRC_URI[sha256sum] = "e7f95cc61d601f6267f87741c333ec5663a6fb538c79770dc094c2556fa757c0"
 
-DEPENDS += "pil-squasher-native mtools-native"
-
 FW_QCOM_NAME = "qcm2290"
 
 require recipes-bsp/firmware/firmware-qcom.inc
 
-do_compile:append() {
-    pil-squasher 10-adreno-fw/a702_zap.mbn 10-adreno-fw/a702_zap.mdt
-    pil-squasher 12-adsp_split/adsp.mbn 12-adsp_split/adsp.mdt
-    pil-squasher 17-venus_split/venus.mbn 17-venus_split/venus.mdt
-    pil-squasher 32-modem/modem.mbn 32-modem/modem.mdt
-}
-
-ATH10K_PATH = "${nonarch_base_libdir}/firmware/ath10k/WCN3990/hw1.0"
-
 do_install() {
     install -d ${D}${sysconfdir}/
     install -m 0644 LICENSE.qcom.txt ${D}${sysconfdir}/QCOM-LINUX-BOARD-SUPPORT-LICENSE-${PN}
 
     install -d ${D}${FW_QCOM_PATH}
 
     install -m 0444 04-dspso/dspso.bin ${D}${FW_QCOM_PATH}
-
-    install -m 0444 10-adreno-fw/a702_zap.mbn ${D}${FW_QCOM_PATH}
-    install -m 0444 12-adsp_split/adsp.mbn ${D}${FW_QCOM_PATH}
-    install -m 0444 32-modem/modem.mbn ${D}${FW_QCOM_PATH}
-
-    install -m 0444 22-jsn/*jsn ${D}${FW_QCOM_PATH}
-
-    install -d ${D}${ATH10K_PATH}
-    install -m 0444 33-wlanmdsp/wlanmdsp.mbn ${D}${ATH10K_PATH}/wlanmdsp-rb12.mbn
-    ln -s ../../ath10k/WCN3990/hw1.0/wlanmdsp-rb12.mbn ${D}${FW_QCOM_PATH}/wlanmdsp.mbn
-
-    install -d ${D}${FW_QCOM_BASE_PATH}/venus-6.0
-    install -m 0444 17-venus_split/venus.mbn ${D}${FW_QCOM_BASE_PATH}/venus-6.0
 }
 
 SPLIT_FIRMWARE_PACKAGES = " \
     ${PN}-dspso \
-    linux-firmware-qcom-${FW_QCOM_NAME}-adreno \
-    linux-firmware-qcom-${FW_QCOM_NAME}-audio \
-    linux-firmware-qcom-${FW_QCOM_NAME}-modem \
-    linux-firmware-qcom-${FW_QCOM_NAME}-wifi \
-    linux-firmware-ath10k-wlanmdsp-rb12 \
-    linux-firmware-qcom-venus-6.0 \
 "
-
-FILES:linux-firmware-ath10k-wlanmdsp-rb12 = "${ATH10K_PATH}"
-FILES:linux-firmware-qcom-venus-6.0 = "${FW_QCOM_BASE_PATH}/venus-6.0"
diff --git a/recipes-bsp/firmware/firmware-qcom-rb2_20230823-v2.bb b/recipes-bsp/firmware/firmware-qcom-rb2_20230823-v2.bb
@@ -7,45 +7,19 @@ SRC_URI = "http://releases.linaro.org/96boards/rb2/qualcomm/firmware/RB2_firmwar
 SRC_URI[md5sum] = "53b6cda776cb534883e6c2a048ad97ec"
 SRC_URI[sha256sum] = "5d96c6f224cd4667afd47770b6cd0ad2ad912fe67fec86f4478ad8dcffae8531"
 
-DEPENDS += "pil-squasher-native"
-
 FW_QCOM_NAME = "qrb4210"
 
 require recipes-bsp/firmware/firmware-qcom.inc
 
-do_compile:append() {
-    pil-squasher 10-cdsp_split/cdsp.mbn 10-cdsp_split/cdsp.mdt
-    pil-squasher 11-adreno-fw/a610_zap.mbn 11-adreno-fw/a610_zap.mdt
-    pil-squasher 13-adsp_split/adsp.mbn 13-adsp_split/adsp.mdt
-    pil-squasher 33-modem/modem.mbn 33-modem/modem.mdt
-}
-
 do_install() {
     install -d ${D}${sysconfdir}/
     install -m 0644 LICENSE.qcom.txt ${D}${sysconfdir}/QCOM-LINUX-BOARD-SUPPORT-LICENSE-${PN}
 
     install -d ${D}${FW_QCOM_PATH}
 
     install -m 0444 04-dspso/dspso.bin ${D}${FW_QCOM_PATH}
-
-    install -m 0444 10-cdsp_split/cdsp.mbn ${D}${FW_QCOM_PATH}
-    install -m 0444 11-adreno-fw/a610_zap.mbn ${D}${FW_QCOM_PATH}
-    install -m 0444 13-adsp_split/adsp.mbn ${D}${FW_QCOM_PATH}
-    install -m 0444 33-modem/modem.mbn ${D}${FW_QCOM_PATH}
-
-    # The file is installed in rb1 firmware recipe
-    ln -s ../../ath10k/WCN3990/hw1.0/wlanmdsp-rb12.mbn ${D}${FW_QCOM_PATH}/wlanmdsp.mbn
-
-    install -m 0444 23-jsn/*jsn ${D}${FW_QCOM_PATH}
 }
 
-RDEPENDS_linux-firmware-qcom-${FW_QCOM_NAME}-wifi += "linux-firmware-ath10k-wlanmdsp-rb12"
-
 SPLIT_FIRMWARE_PACKAGES = " \
     ${PN}-dspso \
-    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}-wifi \
 "
diff --git a/recipes-bsp/firmware/firmware-qcom-rb5_20210331-v4.bb b/recipes-bsp/firmware/firmware-qcom-rb5_20210331-v4.bb
@@ -23,14 +23,10 @@ do_install() {
 
     install -m 0444 ./08-dspso/dspso.bin ${D}${FW_QCOM_PATH}
 
-    install -m 0444 ./30-slpi_split/slpi.mbn  ${D}${FW_QCOM_PATH}/
-    install -m 0444 ./39-jsn/slpi*.jsn  ${D}${FW_QCOM_PATH}/
-
     install -d ${D}${sysconfdir}/
     install -m 0644 LICENSE.qcom.txt ${D}${sysconfdir}/QCOM-LINUX-BOARD-SUPPORT-LICENSE-${PN}
 }
 
 SPLIT_FIRMWARE_PACKAGES = " \
     ${PN}-dspso \
-    linux-firmware-qcom-${FW_QCOM_NAME}-sensors \
 "