From f6496788a444e68eb0aa42a5cb6950f8a21704aa Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Fri, 23 Apr 2021 16:58:12 +0200 Subject: [PATCH] gatesgarth migration: firmware-imx: Upgrade to v8.11 Sync with BSP release rel_imx_5.10.9_1.0.0 https://jira.digi.com/browse/DEL-7508 Signed-off-by: Arturo Buzarra --- ...are-imx-8.10.inc => firmware-imx-8.11.inc} | 6 +-- ...e-imx-8_8.10.bb => firmware-imx-8_8.11.bb} | 0 ...imx-8m_8.10.bb => firmware-imx-8m_8.11.bb} | 0 ...mware-imx_8.10.bb => firmware-imx_8.11.bb} | 45 ++++++------------- 4 files changed, 17 insertions(+), 34 deletions(-) rename meta-digi-arm/recipes-bsp/firmware-imx/{firmware-imx-8.10.inc => firmware-imx-8.11.inc} (58%) rename meta-digi-arm/recipes-bsp/firmware-imx/{firmware-imx-8_8.10.bb => firmware-imx-8_8.11.bb} (100%) rename meta-digi-arm/recipes-bsp/firmware-imx/{firmware-imx-8m_8.10.bb => firmware-imx-8m_8.11.bb} (100%) rename meta-digi-arm/recipes-bsp/firmware-imx/{firmware-imx_8.10.bb => firmware-imx_8.11.bb} (61%) diff --git a/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx-8.10.inc b/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx-8.11.inc similarity index 58% rename from meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx-8.10.inc rename to meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx-8.11.inc index d792bbbc6..a2a4be7d4 100644 --- a/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx-8.10.inc +++ b/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx-8.11.inc @@ -3,14 +3,14 @@ # Copyright (C) 2018 O.S. Systems Software LTDA. SECTION = "base" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" +LIC_FILES_CHKSUM = "file://COPYING;md5=a632fefd1c359980434f9389833cab3a" SRC_URI = " \ ${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \ " -SRC_URI[md5sum] = "3f8c4661ca0f64ca30fd239f66b6a471" -SRC_URI[sha256sum] = "2b70f169d4065b2a7ac7a676afe24636128bd2dacc9f5230346758c3b146b2be" +SRC_URI[md5sum] = "663942fabdf8808c2aa9cfbd21c48cc2" +SRC_URI[sha256sum] = "1a7aaab69cd8c48d10ffb0118c938f4b3daf4c7fd86f0342f4d352906f8e0ecb" S = "${WORKDIR}/firmware-imx-${PV}" diff --git a/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx-8_8.10.bb b/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx-8_8.11.bb similarity index 100% rename from meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx-8_8.10.bb rename to meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx-8_8.11.bb diff --git a/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx-8m_8.10.bb b/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx-8m_8.11.bb similarity index 100% rename from meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx-8m_8.10.bb rename to meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx-8m_8.11.bb diff --git a/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_8.10.bb b/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_8.11.bb similarity index 61% rename from meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_8.10.bb rename to meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_8.11.bb index 3559d26c7..a8311a9b6 100644 --- a/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_8.10.bb +++ b/meta-digi-arm/recipes-bsp/firmware-imx/firmware-imx_8.11.bb @@ -11,37 +11,21 @@ SRC_URI_append = " \ file://epdc \ file://regulatory \ file://hdmi \ - file://sdma-firmware.service \ - file://epdc-firmware.service \ - file://regulatory-firmware.service \ - file://hdmi-firmware.service \ " PE = "1" -inherit allarch systemd - -SYSTEMD_PACKAGES = "${PN}-sdma ${PN}-epdc ${PN}-regulatory ${PN}-hdmi" -SYSTEMD_SERVICE_${PN}-sdma = "sdma-firmware.service" -SYSTEMD_SERVICE_${PN}-epdc = "epdc-firmware.service" -SYSTEMD_SERVICE_${PN}-regulatory = "regulatory-firmware.service" -SYSTEMD_SERVICE_${PN}-hdmi = "hdmi-firmware.service" +inherit allarch do_install() { install -d ${D}${base_libdir}/firmware/imx - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${sysconfdir} - install -d ${D}${systemd_system_unitdir} - install -m 0755 ${WORKDIR}/sdma ${D}${sysconfdir} - install -m 0755 ${WORKDIR}/epdc ${D}${sysconfdir} - install -m 0755 ${WORKDIR}/regulatory ${D}${sysconfdir} - install -m 0755 ${WORKDIR}/hdmi ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/sdma-firmware.service ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/epdc-firmware.service ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/regulatory-firmware.service ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/hdmi-firmware.service ${D}${systemd_system_unitdir} - fi + # Install loading scripts + install -d ${D}${sysconfdir} + install -m 0755 ${WORKDIR}/sdma ${D}${sysconfdir} + install -m 0755 ${WORKDIR}/epdc ${D}${sysconfdir} + install -m 0755 ${WORKDIR}/regulatory ${D}${sysconfdir} + install -m 0755 ${WORKDIR}/hdmi ${D}${sysconfdir} cd firmware for d in *; do @@ -58,9 +42,9 @@ do_install() { cd - # Install SDMA Firmware: sdma-imx6q.bin & sdma-imx7d.bin into lib/firmware/imx/sdma - install -d ${D}${nonarch_base_libdir}/firmware/imx/sdma - mv ${D}${base_libdir}/firmware/sdma/sdma-imx6q.bin ${D}${nonarch_base_libdir}/firmware/imx/sdma - mv ${D}${base_libdir}/firmware/sdma/sdma-imx7d.bin ${D}${nonarch_base_libdir}/firmware/imx/sdma + install -d ${D}${base_libdir}/firmware/imx/sdma + mv ${D}${base_libdir}/firmware/sdma/sdma-imx6q.bin ${D}${base_libdir}/firmware/imx/sdma + mv ${D}${base_libdir}/firmware/sdma/sdma-imx7d.bin ${D}${base_libdir}/firmware/imx/sdma mv ${D}${base_libdir}/firmware/epdc/ ${D}${base_libdir}/firmware/imx/epdc/ mv ${D}${base_libdir}/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted ${D}${base_libdir}/firmware/imx/epdc/epdc_ED060XH2C1.fw @@ -107,12 +91,11 @@ PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-*" PACKAGES =+ "${PN}-epdc ${PN}-sdma ${PN}-easrc ${PN}-regulatory ${PN}-hdmi ${PN}-xcvr ${PN}-xuvi" -FILES_${PN}-epdc = "${base_libdir}/firmware/imx/epdc/ ${sysconfdir}/epdc ${systemd_system_unitdir}/epdc-firmware.service" -FILES_${PN}-scfw = "${base_libdir}/firmware/scfw/" -FILES_${PN}-sdma = "${nonarch_base_libdir}/firmware/imx/sdma ${sysconfdir}/sdma ${systemd_system_unitdir}/sdma-firmware.service" +FILES_${PN}-epdc = "${base_libdir}/firmware/imx/epdc/ ${sysconfdir}/epdc" +FILES_${PN}-sdma = "${base_libdir}/firmware/imx/sdma ${sysconfdir}/sdma" FILES_${PN}-easrc = "${base_libdir}/firmware/imx/easrc/" -FILES_${PN}-regulatory = "${sysconfdir}/regulatory ${systemd_system_unitdir}/regulatory-firmware.service" -FILES_${PN}-hdmi = "${base_libdir}/firmware/imx/hdmi/ ${systemd_system_unitdir}/hdmi-firmware.service" +FILES_${PN}-regulatory = "${sysconfdir}/regulatory" +FILES_${PN}-hdmi = "${base_libdir}/firmware/imx/hdmi/ ${sysconfdir}/hdmi" FILES_${PN}-xcvr = "${base_libdir}/firmware/imx/xcvr/" FILES_${PN}-xuvi = "${base_libdir}/firmware/imx/xuvi/"