From c2cc3aca80022308bce50e0c8bb13222c03d849f Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Wed, 7 Apr 2021 15:14:54 +0300 Subject: firmware-qcom-rb5: update to new firmware release Update to the new firmware release. This provides updated a650 firmware, fixing security issues, which shoul work with 5.12 kernel. Signed-off-by: Dmitry Baryshkov --- .../firmware-qcom-rb5_20210118133815-v2.bb | 73 -------------------- .../firmware/firmware-qcom-rb5_20210331-v4.bb | 78 ++++++++++++++++++++++ 2 files changed, 78 insertions(+), 73 deletions(-) delete mode 100644 recipes-bsp/firmware/firmware-qcom-rb5_20210118133815-v2.bb create mode 100644 recipes-bsp/firmware/firmware-qcom-rb5_20210331-v4.bb diff --git a/recipes-bsp/firmware/firmware-qcom-rb5_20210118133815-v2.bb b/recipes-bsp/firmware/firmware-qcom-rb5_20210118133815-v2.bb deleted file mode 100644 index 79b97e3..0000000 --- a/recipes-bsp/firmware/firmware-qcom-rb5_20210118133815-v2.bb +++ /dev/null @@ -1,73 +0,0 @@ -# Provide base URI of NHLOS_Binaries.zip and adreno_1.0_qrb5165_rb5.tar.gz -# files. Use "file://" if those files are copied into -# recipes-bsp/firmware/files/ directory. -# NHLOS_URI ?= "file://" -# ADRENO_URI ?= "file://" - -DESCRIPTION = "QCOM Firmware for Qualcomm Robotics RB5 platform" - -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://LICENSE.qcom.txt;md5=cbbe399f2c983ad51768f4561587f000" - -SRC_URI = " \ - http://releases.linaro.org/96boards/rb5/qualcomm/firmware/RB5_firmware_${PV}.zip;subdir=${BP} \ -" -SRC_URI[md5sum] = "d9289f59fe4f93ce433707294c9286ca" -SRC_URI[sha256sum] = "9d7b42916d83c8f721258175b8d7a9ed758ebe02228d36099e6ea1a2b2a556d3" - -DEPENDS += "qca-swiss-army-knife-native" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -VENUS_FW = "vpu-1.0" - -do_compile() { - # Build board-2.bin needed by WiFi - ath11k-generate-board-2_json.sh ./38-bdwlan_split board-2.json - python3 "${STAGING_BINDIR_NATIVE}/ath10k-bdencoder" -m ath11k -c board-2.json -o board-2.bin -} - -do_install() { - install -d ${D}${nonarch_base_libdir}/firmware/qcom/sm8250 - - install -m 0444 ./08-dspso/dspso.bin ${D}${nonarch_base_libdir}/firmware/qcom/sm8250 - - install -m 0444 ./18-adreno-fw/a650_gmu.bin ${D}${nonarch_base_libdir}/firmware/qcom - install -m 0444 ./18-adreno-fw/a650_sqe.fw ${D}${nonarch_base_libdir}/firmware/qcom - install -m 0444 ./18-adreno-fw/a650_zap.elf ${D}${nonarch_base_libdir}/firmware/qcom/sm8250/a650_zap.mbn - - install -m 0444 ./20-adsp_split/adsp.mbn ${D}${nonarch_base_libdir}/firmware/qcom/sm8250/ - install -m 0444 ./21-cdsp_split/cdsp.mbn ${D}${nonarch_base_libdir}/firmware/qcom/sm8250/ - install -m 0444 ./30-slpi_split/slpi.mbn ${D}${nonarch_base_libdir}/firmware/qcom/sm8250/ - - install -m 0444 ./39-jsn/*.jsn ${D}${nonarch_base_libdir}/firmware/qcom/sm8250/ - - install -d ${D}${nonarch_base_libdir}/firmware/qcom/${VENUS_FW} - install -m 0444 ./33-venus_split/venus.b* ./33-venus_split/venus.mdt ${D}${nonarch_base_libdir}/firmware/qcom/${VENUS_FW} - - install -d ${D}${nonarch_base_libdir}/firmware/ath11k/QCA6390/hw2.0/ - install -m 0444 ${S}/board-2.bin ${D}${nonarch_base_libdir}/firmware/ath11k/QCA6390/hw2.0/board-2.bin - - install -d ${D}${sysconfdir}/ - install -m 0644 LICENSE.qcom.txt ${D}${sysconfdir}/QCOM-LINUX-BOARD-SUPPORT-LICENSE-${PN} -} - -FILES_${PN} += "${nonarch_base_libdir}/firmware/" -INSANE_SKIP_${PN} += "arch" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_DEFAULT_DEPS = "1" - -RPROVIDES_${PN} += "linux-firmware-qcom-adreno-a650" -RREPLACES_${PN} += "linux-firmware-qcom-adreno-a650" -RCONFLICTS_${PN} += "linux-firmware-qcom-adreno-a650" - -RPROVIDES_${PN} += "linux-firmware-qcom-${VENUS_FW}" -RREPLACES_${PN} += "linux-firmware-qcom-${VENUS_FW}" -RCONFLICTS_${PN} += "linux-firmware-qcom-${VENUS_FW}" - -inherit update-alternatives - -ALTERNATIVE_${PN} = "qca6390-board2" -ALTERNATIVE_LINK_NAME[qca6390-board2] = "/lib/firmware/ath11k/QCA6390/hw2.0/board-2.bin" -ALTERNATIVE_PRIORITY = "100" diff --git a/recipes-bsp/firmware/firmware-qcom-rb5_20210331-v4.bb b/recipes-bsp/firmware/firmware-qcom-rb5_20210331-v4.bb new file mode 100644 index 0000000..618a55f --- /dev/null +++ b/recipes-bsp/firmware/firmware-qcom-rb5_20210331-v4.bb @@ -0,0 +1,78 @@ +# Provide base URI of NHLOS_Binaries.zip and adreno_1.0_qrb5165_rb5.tar.gz +# files. Use "file://" if those files are copied into +# recipes-bsp/firmware/files/ directory. +# NHLOS_URI ?= "file://" +# ADRENO_URI ?= "file://" + +DESCRIPTION = "QCOM Firmware for Qualcomm Robotics RB5 platform" + +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://LICENSE.qcom.txt;md5=cbbe399f2c983ad51768f4561587f000" + +SRC_URI = " \ + http://releases.linaro.org/96boards/rb5/qualcomm/firmware/RB5_firmware_${PV}.zip;subdir=${BP} \ +" +SRC_URI[md5sum] = "d65ec09ba18dcafe291c870e0516c290" +SRC_URI[sha256sum] = "30e2c02be32de9f809b590f4fe76d9eb66d35f8c7d13b1f2850beb3d793192cc" + +# From v2 to v4 the versioning has changed, so add epoch +# 20210118133815-v2 +# 20210331-v4 +PE = "1" + +DEPENDS += "qca-swiss-army-knife-native" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +VENUS_FW = "vpu-1.0" + +do_compile() { + # Build board-2.bin needed by WiFi + ath11k-generate-board-2_json.sh ./38-bdwlan_split board-2.json + python3 "${STAGING_BINDIR_NATIVE}/ath10k-bdencoder" -m ath11k -c board-2.json -o board-2.bin +} + +do_install() { + install -d ${D}${nonarch_base_libdir}/firmware/qcom/sm8250 + + install -m 0444 ./08-dspso/dspso.bin ${D}${nonarch_base_libdir}/firmware/qcom/sm8250 + + install -m 0444 ./18-adreno-fw/a650_gmu.bin ${D}${nonarch_base_libdir}/firmware/qcom + install -m 0444 ./18-adreno-fw/a650_sqe.fw ${D}${nonarch_base_libdir}/firmware/qcom + install -m 0444 ./18-adreno-fw/a650_zap.elf ${D}${nonarch_base_libdir}/firmware/qcom/sm8250/a650_zap.mbn + + install -m 0444 ./20-adsp_split/adsp.mbn ${D}${nonarch_base_libdir}/firmware/qcom/sm8250/ + install -m 0444 ./21-cdsp_split/cdsp.mbn ${D}${nonarch_base_libdir}/firmware/qcom/sm8250/ + install -m 0444 ./30-slpi_split/slpi.mbn ${D}${nonarch_base_libdir}/firmware/qcom/sm8250/ + + install -m 0444 ./39-jsn/*.jsn ${D}${nonarch_base_libdir}/firmware/qcom/sm8250/ + + install -d ${D}${nonarch_base_libdir}/firmware/qcom/${VENUS_FW} + install -m 0444 ./33-venus_split/venus.b* ./33-venus_split/venus.mdt ${D}${nonarch_base_libdir}/firmware/qcom/${VENUS_FW} + + install -d ${D}${nonarch_base_libdir}/firmware/ath11k/QCA6390/hw2.0/ + install -m 0444 ${S}/board-2.bin ${D}${nonarch_base_libdir}/firmware/ath11k/QCA6390/hw2.0/board-2.bin + + install -d ${D}${sysconfdir}/ + install -m 0644 LICENSE.qcom.txt ${D}${sysconfdir}/QCOM-LINUX-BOARD-SUPPORT-LICENSE-${PN} +} + +FILES_${PN} += "${nonarch_base_libdir}/firmware/" +INSANE_SKIP_${PN} += "arch" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_DEFAULT_DEPS = "1" + +RPROVIDES_${PN} += "linux-firmware-qcom-adreno-a650" +RREPLACES_${PN} += "linux-firmware-qcom-adreno-a650" +RCONFLICTS_${PN} += "linux-firmware-qcom-adreno-a650" + +RPROVIDES_${PN} += "linux-firmware-qcom-${VENUS_FW}" +RREPLACES_${PN} += "linux-firmware-qcom-${VENUS_FW}" +RCONFLICTS_${PN} += "linux-firmware-qcom-${VENUS_FW}" + +inherit update-alternatives + +ALTERNATIVE_${PN} = "qca6390-board2" +ALTERNATIVE_LINK_NAME[qca6390-board2] = "/lib/firmware/ath11k/QCA6390/hw2.0/board-2.bin" +ALTERNATIVE_PRIORITY = "100" -- cgit From fe8a1266c46823835b38a4f120c1317c72773d18 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Wed, 7 Apr 2021 15:17:13 +0300 Subject: linux-linaro-qcomlt: update to 5.12 Update RB5 kernel from 5.11 to 5.12. Signed-off-by: Dmitry Baryshkov --- recipes-kernel/linux/linux-linaro-qcomlt_5.11.bb | 15 --------------- recipes-kernel/linux/linux-linaro-qcomlt_5.12.bb | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 recipes-kernel/linux/linux-linaro-qcomlt_5.11.bb create mode 100644 recipes-kernel/linux/linux-linaro-qcomlt_5.12.bb diff --git a/recipes-kernel/linux/linux-linaro-qcomlt_5.11.bb b/recipes-kernel/linux/linux-linaro-qcomlt_5.11.bb deleted file mode 100644 index 18f6acf..0000000 --- a/recipes-kernel/linux/linux-linaro-qcomlt_5.11.bb +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (C) 2014-2020 Linaro -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "Linaro Qualcomm Landing team 5.11 Kernel" -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - -require recipes-kernel/linux/linux-linaro-qcom.inc -require recipes-kernel/linux/linux-qcom-bootimg.inc - -LOCALVERSION ?= "-linaro-lt-qcom" - -SRCBRANCH = "release/rb5/qcomlt-5.11" -SRCREV = "17daa17a8971e68b9bf48e2965042860ce994435" - -COMPATIBLE_MACHINE = "(sm8250)" diff --git a/recipes-kernel/linux/linux-linaro-qcomlt_5.12.bb b/recipes-kernel/linux/linux-linaro-qcomlt_5.12.bb new file mode 100644 index 0000000..ab86959 --- /dev/null +++ b/recipes-kernel/linux/linux-linaro-qcomlt_5.12.bb @@ -0,0 +1,15 @@ +# Copyright (C) 2014-2021 Linaro +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Linaro Qualcomm Landing team 5.12 Kernel" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +require recipes-kernel/linux/linux-linaro-qcom.inc +require recipes-kernel/linux/linux-qcom-bootimg.inc + +LOCALVERSION ?= "-linaro-lt-qcom" + +SRCBRANCH = "release/rb5/qcomlt-5.12" +SRCREV = "56d9230c7e441a00b30468071557b68d0fa5ce55" + +COMPATIBLE_MACHINE = "(sm8250)" -- cgit