Merge pull request #674 from lumag/hexagon-dsp-binaries

Use Hexagon DSP binaries recipe

Author: lumag

recipes-bsp/firmware-nexus/firmware-qcom-pixel.inc

@@ -16,6 +16,12 @@ DEPENDS += "pil-squasher-native"
 
 VENDOR_IMG_SPARSE ?= "1"
 
+PACKAGES =+ "${PN}-dsp-binaries"
+INSANE_SKIP:${PN}-dsp-binaries += "arch libdir file-rdeps textrel"
+FILES:${PN}-dsp-binaries = "${DSP_QCOM_BASE_PATH}"
+RDEPENDS:${PN}-dsp-binaries += "${PN} (= ${PV})"
+RRECOMMENDS:${PN} += "${PN}-dsp-binaries"
+
 # extract the license file
 do_extract() {
     head -n 280 ${UNPACKDIR}/extract-${VENDOR}-${FW_QCOM_NAME}.sh | tail -n +16 > ${S}/license.txt
@@ -27,14 +33,13 @@ do_extract() {
         ln -sr ${S}/vendor/${VENDOR}/${FW_QCOM_NAME}/proprietary/vendor.img ${B}/vendor.img
     fi
 
-    # FIXME: also extract fastrpc shell
-    mkdir -p ${B}/firmware
-    debugfs ${B}/vendor.img -R 'ls -p /firmware' | \
-        grep '^/[0-9]*/100' | cut -d/ -f6 > ${B}/firmware/fw.lst
-    debugfs ${B}/vendor.img -R 'ls -p /firmware' | \
-        grep '^/[0-9]*/100' | cut -d/ -f6 | \
-        while read name ; do echo "dump /firmware/$name ${B}/firmware/$name" ; done | \
-        debugfs ${B}/vendor.img
+    for path in firmware dsp/adsp dsp/cdsp dsp/sdsp lib/rfsa/adsp ; do
+        mkdir -p ${B}/$path
+        debugfs ${B}/vendor.img -R "ls -p /$path" | \
+            grep '^/[0-9]*/100' | cut -d/ -f6 | \
+            while read name ; do echo "dump /$path/$name ${B}/$path/$name" ; done | \
+            debugfs ${B}/vendor.img
+    done
 
     radio="${S}/vendor/${VENDOR}/${FW_QCOM_NAME}/proprietary/radio.img"
     if [ -r "${radio}" ] ; then
@@ -75,11 +80,17 @@ do_install() {
     ls ${B}/firmware/a[0-9]*_gmu.bin && install -m 0644 ${B}/firmware/a[0-9]*_gmu.bin ${D}${FW_QCOM_PATH}
     ls ${B}/a[0-9]*.mbn && install -m 0644 ${B}/a[0-9]*.mbn ${D}${FW_QCOM_PATH}
 
+    ls ${B}/dsp/adsp/* && mkdir -p ${D}${DSP_QCOM_PATH}/dsp/adsp && install -m 0644 ${B}/dsp/adsp/* ${D}${DSP_QCOM_PATH}/dsp/adsp
+    ls ${B}/dsp/cdsp/* && mkdir -p ${D}${DSP_QCOM_PATH}/dsp/cdsp && install -m 0644 ${B}/dsp/cdsp/* ${D}${DSP_QCOM_PATH}/dsp/cdsp
+    ls ${B}/dsp/sdsp/* && mkdir -p ${D}${DSP_QCOM_PATH}/dsp/sdsp && install -m 0644 ${B}/dsp/sdsp/* ${D}${DSP_QCOM_PATH}/dsp/sdsp
+    ls ${B}/lib/rfsa/adsp/* && mkdir -p ${D}${DSP_QCOM_PATH}/dsp/lib && install -m 0644 ${B}/lib/rfsa/adsp/* ${D}${DSP_QCOM_PATH}/dsp/lib
+
     install -m 0644 license.txt ${D}${FW_QCOM_PATH}
 
     # Remove duplicates
     rm -f ${D}${FW_QCOM_PATH}/a630_gmu.bin
     rm -f ${D}${FW_QCOM_PATH}/a650_gmu.bin
 
     [ -z "${EXTRA_DEVICE_SUBDIR}" ] || ln -sr ${D}${FW_QCOM_PATH} ${D}${FW_QCOM_BASE_PATH}/${EXTRA_DEVICE_SUBDIR}
+    [ -n "${EXTRA_DEVICE_SUBDIR}" -a -d ${D}${DSP_QCOM_PATH} ] && ln -sr ${D}${DSP_QCOM_PATH} ${D}${DSP_QCOM_BASE_PATH}/${EXTRA_DEVICE_SUBDIR} || true
 }

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

@@ -7,24 +7,13 @@ SRC_URI = "https://releases.linaro.org/96boards/dragonboard845c/qualcomm/firmwar
 SRC_URI[md5sum] = "ad69855a1275547b16d94a1b5405ac62"
 SRC_URI[sha256sum] = "4289d2f2a7124b104d0274879e702aae9b1e50c42eec3747f8584c6744ef65e3"
 
-FW_QCOM_NAME = "sdm845"
-
-require recipes-bsp/firmware/firmware-qcom.inc
-
-DEPENDS += "pil-squasher-native"
+FILES:${PN} += "${nonarch_base_libdir}/firmware/"
 
 do_install() {
     install -d ${D}${nonarch_base_libdir}/firmware/
-    install -d ${D}${FW_QCOM_PATH}
-
-    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 -d ${D}${sysconfdir}/
     install -m 0644 LICENSE.qcom.txt ${D}${sysconfdir}/QCOM-LINUX-BOARD-SUPPORT-LICENSE-${PN}
 }
-
-SPLIT_FIRMWARE_PACKAGES = " \
-    ${PN}-dspso \
-"

recipes-bsp/firmware/firmware-qcom-dragonboard410c_1034.2.1.bb

@@ -12,14 +12,16 @@ FW_QCOM_SUBDIR ?= "${FW_QCOM_NAME}"
 FW_QCOM_BASE_PATH = "${nonarch_base_libdir}/firmware/qcom"
 FW_QCOM_PATH = "${FW_QCOM_BASE_PATH}/${FW_QCOM_SUBDIR}"
 
+DSP_QCOM_BASE_PATH = "${datadir}/qcom"
+DSP_QCOM_PATH = "${DSP_QCOM_BASE_PATH}/${FW_QCOM_SUBDIR}"
+
 SPLIT_FIRMWARE_PACKAGES ?= ""
 
 PACKAGE_BEFORE_PN += "${SPLIT_FIRMWARE_PACKAGES}"
 # RRECOMMEND all non-split packages split from this recipe. Split firmware files re usually replaced with the squashed ones.
 RRECOMMENDS:${PN} += "${@ ' '.join(filter(lambda p: not p.endswith('-split'), d.getVar('SPLIT_FIRMWARE_PACKAGES').split())) }"
 
 # Default settings for several split packages
-FILES:${PN}-dspso += "${FW_QCOM_BASE_PATH}/*/*dspso.bin"
 FILES:linux-firmware-qcom-${FW_QCOM_NAME}-adreno = "${FW_QCOM_PATH}/*_zap.mbn"
 FILES:linux-firmware-qcom-${FW_QCOM_NAME}-audio = "${FW_QCOM_PATH}/adsp.mbn ${FW_QCOM_PATH}/adsp_dtb.mbn ${FW_QCOM_PATH}/adsp*.jsn ${FW_QCOM_PATH}/battmgr.jsn"
 FILES:linux-firmware-qcom-${FW_QCOM_NAME}-audio-split = "${FW_QCOM_PATH}/adsp.mdt ${FW_QCOM_PATH}/adsp.b*"