Simplify a way to sideload proprietary firmware (#1692)

In case of Qualcomm HDK platforms not all the firmware is included into
the NON-HLOS.bin image. Typically Adreno, IPA and Iris firmware are
provided separately. Currently we have firmware-qcom-adreno.inc, which
lets users to sideload Adreno firmware only. Let users provide all
missing firmware files as an archive instead.

Author: lumag

recipes-bsp/firmware/firmware-qcom-adreno.inc

@@ -1,8 +1,13 @@
 # Handle NON-HLOS.bin unpacking in a generic way
 # Include the file to be able to dissect the image using handle_nonhlos_image()
 # If NHLOS_URI is defined, the image will be dissected automatically
+#
+# Additionally PROPRIETARY_URI can be specified. Its contents will be used to
+# provide additional firmware files (like Adreno or IPA), which are not a part
+# of NON-HLOS.bin.
 
 NHLOS_URI ??= ""
+PROPRIETARY_URI ??= ""
 
 # List all firmware files to be installed
 FW_QCOM_LIST ??= ""
@@ -11,7 +16,7 @@ DEPENDS += "pil-squasher-native mtools-native"
 
 # Conditionally populate SRC_URI. We have to do it here rather than in python
 # script to let base.bbclass to pick up dependencies
-SRC_URI += "${NHLOS_URI}"
+SRC_URI += "${NHLOS_URI} ${PROPRIETARY_URI}${@ ';subdir=proprietary' if d.getVar('PROPRIETARY_URI') != '' else '' }"
 
 unpack_nhlos_image() {
     mkdir -p ${B}/firmware
@@ -48,11 +53,11 @@ do_install:prepend() {
     install -d ${D}${FW_QCOM_PATH}
 
     for fw in ${FW_QCOM_LIST} ; do
-        if [ -r ${B}/$fw ] ; then
+        if [ -r ${S}/proprietary/$fw ] ; then
+            install -m 0644 ${S}/proprietary/$fw ${D}${FW_QCOM_PATH}
+        elif [ -r ${B}/$fw ] ; then
             install -m 0644 ${B}/$fw ${D}${FW_QCOM_PATH}
-        fi
-
-        if [ -r ${B}/firmware/image/$fw ] ; then
+        elif [ -r ${B}/firmware/image/$fw ] ; then
             install -m 0644 ${B}/firmware/image/$fw ${D}${FW_QCOM_PATH}
         fi
     done

recipes-bsp/firmware/firmware-qcom-nhlos.inc

@@ -19,7 +19,6 @@ 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 \
@@ -30,9 +29,9 @@ SPLIT_FIRMWARE_PACKAGES = "\
 "
 
 do_install:prepend() {
-    if [ -n "${ADRENO_URI}" ] ; then
+    if [ -r "${UNPACKDIR}/proprietary/a621_gmu.bin" ] ; then
         install -d ${D}${FW_QCOM_BASE_PATH}
-        install -m 0644 ${UNPACKDIR}/adreno/${ADRENO_PATH}/a621_gmu.bin ${D}${FW_QCOM_BASE_PATH}
+        install -m 0644 ${UNPACKDIR}/proprietary/a621_gmu.bin ${D}${FW_QCOM_BASE_PATH}
     fi
 
     if [ -n "${NHLOS_URI}" ] ; then

recipes-bsp/firmware/firmware-qcom-qar2130p.bb

@@ -11,6 +11,7 @@ FW_QCOM_SUBDIR = "sdm845/Qualcomm/SDM845-HDK"
 
 # ADSP, CDSP, modem and WLAN are a part of linux-firmware
 FW_QCOM_LIST = "\
+    ipa_fws.mbn \
     slpi.mbn slpir.jsn \
 "
 
@@ -20,5 +21,6 @@ require recipes-bsp/firmware/firmware-qcom.inc
 require recipes-bsp/firmware/firmware-qcom-nhlos.inc
 
 SPLIT_FIRMWARE_PACKAGES = "\
+    linux-firmware-qcom-${FW_QCOM_NAME}-ipa \
     linux-firmware-qcom-${FW_QCOM_NAME}-sensors \
 "

recipes-bsp/firmware/firmware-qcom-sdm845-hdk.bb

@@ -28,5 +28,13 @@ SPLIT_FIRMWARE_PACKAGES = "\
     linux-firmware-qcom-${FW_QCOM_NAME}-ipa \
     linux-firmware-qcom-${FW_QCOM_NAME}-modem \
     linux-firmware-qcom-${FW_QCOM_NAME}-sensors \
+    linux-firmware-qcom-${FW_QCOM_NAME}-venus \
     linux-firmware-qcom-${FW_QCOM_NAME}-wifi \
 "
+
+do_install:prepend() {
+    if [ -r "${S}/proprietary/venus.mbn" ] ; then
+        install -d ${D}${FW_QCOM_BASE_PATH}/vpu
+        install -m 0644 ${S}/proprietary/venus.mbn ${D}${FW_QCOM_BASE_PATH}/vpu/vpu10_2v.mbn
+    fi
+}

recipes-bsp/firmware/firmware-qcom-sm8150-hdk.bb

@@ -27,4 +27,14 @@ SPLIT_FIRMWARE_PACKAGES = "\
     linux-firmware-qcom-${FW_QCOM_NAME}-ipa \
     linux-firmware-qcom-${FW_QCOM_NAME}-modem \
     linux-firmware-qcom-${FW_QCOM_NAME}-sensors \
+    linux-firmware-qcom-${FW_QCOM_NAME}-venus \
 "
+
+# Different vpu20_4v.mbn files are not compatible and support different
+# platforms. Use platform-specific name for the file in generic location.
+do_install:prepend() {
+    if [ -r "${S}/proprietary/vpu20_4v.mbn" ] ; then
+        install -d ${D}${FW_QCOM_BASE_PATH}/vpu
+        install -m 0644 ${S}/proprietary/vpu20_4v.mbn ${D}${FW_QCOM_BASE_PATH}/vpu/vpu20_4v_sm8350.mbn
+    fi
+}

recipes-bsp/firmware/firmware-qcom-sm8350-hdk.bb

@@ -27,4 +27,14 @@ SPLIT_FIRMWARE_PACKAGES = "\
     linux-firmware-qcom-${FW_QCOM_NAME}-ipa \
     linux-firmware-qcom-${FW_QCOM_NAME}-modem \
     linux-firmware-qcom-${FW_QCOM_NAME}-sensors \
+    linux-firmware-qcom-${FW_QCOM_NAME}-venus \
 "
+
+# Different vpu20_4v.mbn files are not compatible and support different
+# platforms. Use platform-specific name for the file in generic location.
+do_install:prepend() {
+    if [ -r "${S}/proprietary/vpu20_4v.mbn" ] ; then
+        install -d ${D}${FW_QCOM_BASE_PATH}/vpu
+        install -m 0644 ${S}/proprietary/vpu20_4v.mbn ${D}${FW_QCOM_BASE_PATH}/vpu/vpu20_4v_sm8450.mbn
+    fi
+}

recipes-bsp/firmware/firmware-qcom-sm8450-hdk.bb

@@ -29,7 +29,7 @@ FILES:linux-firmware-qcom-${FW_QCOM_NAME}-ipa = "${FW_QCOM_PATH}/ipa_fws.mbn* ${
 FILES:linux-firmware-qcom-${FW_QCOM_NAME}-modem = "${FW_QCOM_PATH}/mba.mbn* ${FW_QCOM_PATH}/modem.mbn* ${FW_QCOM_PATH}/modem*.jsn"
 FILES:linux-firmware-qcom-${FW_QCOM_NAME}-q6 = "${FW_QCOM_PATH}/q6.mbn*"
 FILES:linux-firmware-qcom-${FW_QCOM_NAME}-sensors = "${FW_QCOM_PATH}/slpi.mbn* ${FW_QCOM_PATH}/slpi*.jsn"
-FILES:linux-firmware-qcom-${FW_QCOM_NAME}-venus = "${FW_QCOM_PATH}/venus.mbn* ${FW_QCOM_PATH}/vidc*"
+FILES:linux-firmware-qcom-${FW_QCOM_NAME}-venus = "${FW_QCOM_PATH}/venus.mbn* ${FW_QCOM_PATH}/vidc* ${FW_QCOM_BASE_PATH}/vpu*"
 FILES:linux-firmware-qcom-${FW_QCOM_NAME}-wifi = "${FW_QCOM_PATH}/wcnss.mbn* ${FW_QCOM_PATH}/wlanmdsp.mbn*"
 
 # Possible values are "xz" and "zst".