From d94f748d14d89fd2c62f03ddf181706626b0de91 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 22 May 2019 16:12:11 -0500 Subject: [PATCH] firmware-imx*: Upgrade to 8.1.1 - Remove Broadcom support - Add SDMA support Signed-off-by: Tom Hochstein --- ...are-imx-7.8.inc => firmware-imx-8.1.1.inc} | 8 ++-- ...e-imx-8_7.8.bb => firmware-imx-8_8.1.1.bb} | 0 ...imx-8m_7.8.bb => firmware-imx-8m_8.1.1.bb} | 0 ...imx-8x_7.8.bb => firmware-imx-8x_8.1.1.bb} | 0 ...mware-imx_7.8.bb => firmware-imx_8.1.1.bb} | 43 +++---------------- 5 files changed, 10 insertions(+), 41 deletions(-) rename recipes-bsp/firmware-imx/{firmware-imx-7.8.inc => firmware-imx-8.1.1.inc} (55%) rename recipes-bsp/firmware-imx/{firmware-imx-8_7.8.bb => firmware-imx-8_8.1.1.bb} (100%) rename recipes-bsp/firmware-imx/{firmware-imx-8m_7.8.bb => firmware-imx-8m_8.1.1.bb} (100%) rename recipes-bsp/firmware-imx/{firmware-imx-8x_7.8.bb => firmware-imx-8x_8.1.1.bb} (100%) rename recipes-bsp/firmware-imx/{firmware-imx_7.8.bb => firmware-imx_8.1.1.bb} (52%) diff --git a/recipes-bsp/firmware-imx/firmware-imx-7.8.inc b/recipes-bsp/firmware-imx/firmware-imx-8.1.1.inc similarity index 55% rename from recipes-bsp/firmware-imx/firmware-imx-7.8.inc rename to recipes-bsp/firmware-imx/firmware-imx-8.1.1.inc index 6da6736c..33b9594a 100644 --- a/recipes-bsp/firmware-imx/firmware-imx-7.8.inc +++ b/recipes-bsp/firmware-imx/firmware-imx-8.1.1.inc @@ -1,17 +1,17 @@ # Copyright (C) 2012-2016 Freescale Semiconductor -# Copyright 2017-2018 NXP +# Copyright 2017-2019 NXP # Copyright (C) 2018 O.S. Systems Software LTDA. SECTION = "base" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=5ab1a30d0cd181e3408077727ea5a2db" +LIC_FILES_CHKSUM = "file://COPYING;md5=fb0303e4ee8b0e71c094171e2272bd44" SRCBRANCH ?= "master" SRC_URI = " \ ${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \ " -SRC_URI[md5sum] = "0967aa59b3fd8d80fcb98146a9aac91b" -SRC_URI[sha256sum] = "910fbf866f61185adfd60c1704b2da41030cb175901d06e40402b49f9240bdee" +SRC_URI[md5sum] = "b494c9a2ba9f8906de73ac33068789a2" +SRC_URI[sha256sum] = "c115d5d0d115fc14754671bd2428f672f9f99677988588accef2fbca2c3f749c" S = "${WORKDIR}/firmware-imx-${PV}" diff --git a/recipes-bsp/firmware-imx/firmware-imx-8_7.8.bb b/recipes-bsp/firmware-imx/firmware-imx-8_8.1.1.bb similarity index 100% rename from recipes-bsp/firmware-imx/firmware-imx-8_7.8.bb rename to recipes-bsp/firmware-imx/firmware-imx-8_8.1.1.bb diff --git a/recipes-bsp/firmware-imx/firmware-imx-8m_7.8.bb b/recipes-bsp/firmware-imx/firmware-imx-8m_8.1.1.bb similarity index 100% rename from recipes-bsp/firmware-imx/firmware-imx-8m_7.8.bb rename to recipes-bsp/firmware-imx/firmware-imx-8m_8.1.1.bb diff --git a/recipes-bsp/firmware-imx/firmware-imx-8x_7.8.bb b/recipes-bsp/firmware-imx/firmware-imx-8x_8.1.1.bb similarity index 100% rename from recipes-bsp/firmware-imx/firmware-imx-8x_7.8.bb rename to recipes-bsp/firmware-imx/firmware-imx-8x_8.1.1.bb diff --git a/recipes-bsp/firmware-imx/firmware-imx_7.8.bb b/recipes-bsp/firmware-imx/firmware-imx_8.1.1.bb similarity index 52% rename from recipes-bsp/firmware-imx/firmware-imx_7.8.bb rename to recipes-bsp/firmware-imx/firmware-imx_8.1.1.bb index bf0fbc3f..96a09e38 100644 --- a/recipes-bsp/firmware-imx/firmware-imx_7.8.bb +++ b/recipes-bsp/firmware-imx/firmware-imx_8.1.1.bb @@ -1,5 +1,5 @@ # Copyright (C) 2012-2016 Freescale Semiconductor -# Copyright 2017-2018 NXP +# Copyright 2017-2019 NXP # Copyright (C) 2018 O.S. Systems Software LTDA. SUMMARY = "Freescale i.MX firmware" DESCRIPTION = "Freescale i.MX firmware such as for the VPU" @@ -17,8 +17,6 @@ inherit allarch do_install() { install -d ${D}${base_libdir}/firmware/imx - install -d ${D}${base_libdir}/firmware/bcm - install -d ${D}${sysconfdir}/firmware cd firmware for d in *; do @@ -34,38 +32,9 @@ do_install() { done cd - - #1BW_BCM43340 - install -d ${D}${base_libdir}/firmware/bcm/1BW_BCM43340 - cp -rfv git/brcm/1BW_BCM43340/*.bin ${D}${base_libdir}/firmware/bcm/1BW_BCM43340 - cp -rfv git/brcm/1BW_BCM43340/*.cal ${D}${base_libdir}/firmware/bcm/1BW_BCM43340 - cp -rfv git/brcm/1BW_BCM43340/*.hcd ${D}${sysconfdir}/firmware/ - - #1CX_BCM4356 - install -d ${D}${base_libdir}/firmware/bcm/1CX_BCM4356 - cp -rfv git/brcm/1CX_BCM4356/fw_bcmdhd.bin ${D}${base_libdir}/firmware/bcm/1CX_BCM4356 - - #1DX_BCM4343W - install -d ${D}${base_libdir}/firmware/bcm/1DX_BCM4343W - cp -rfv git/brcm/1DX_BCM4343W/*.bin ${D}${base_libdir}/firmware/bcm/1DX_BCM4343W - cp -rfv git/brcm/1DX_BCM4343W/*.cal ${D}${base_libdir}/firmware/bcm/1DX_BCM4343W - cp -rfv git/brcm/1DX_BCM4343W/*.hcd ${D}${sysconfdir}/firmware/ - - #1FD_BCM89359 - install -d ${D}${base_libdir}/firmware/bcm/1FD_BCM89359 - cp -rfv git/brcm/1FD_BCM89359/*.bin ${D}${base_libdir}/firmware/bcm/1FD_BCM89359 - cp -rfv git/brcm/1FD_BCM89359/*.hcd ${D}${sysconfdir}/firmware/ - - #SN8000_BCM43362 - install -d ${D}${base_libdir}/firmware/bcm/SN8000_BCM43362 - cp -rfv git/brcm/SN8000_BCM43362/*.bin ${D}${base_libdir}/firmware/bcm/SN8000_BCM43362 - cp -rfv git/brcm/SN8000_BCM43362/*.cal ${D}${base_libdir}/firmware/bcm/SN8000_BCM43362 - cp -rfv git/brcm/1DX_BCM4343W/*.hcd ${D}${sysconfdir}/firmware/ - - #ZP_BCM4339 - install -d ${D}${base_libdir}/firmware/bcm/ZP_BCM4339 - cp -rfv git/brcm/ZP_BCM4339/*.bin ${D}${base_libdir}/firmware/bcm/ZP_BCM4339 - cp -rfv git/brcm/ZP_BCM4339/*.cal ${D}${base_libdir}/firmware/bcm/ZP_BCM4339 - cp -rfv git/brcm/ZP_BCM4339/*.hcd ${D}${sysconfdir}/firmware/ + 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 @@ -97,10 +66,10 @@ ALLOW_EMPTY_${PN} = "1" PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-*" -PACKAGES =+ "${PN}-epdc ${PN}-brcm ${PN}-scfw" +PACKAGES =+ "${PN}-epdc ${PN}-scfw ${PN}-sdma" FILES_${PN}-epdc = "${base_libdir}/firmware/imx/epdc/" -FILES_${PN}-brcm = "${base_libdir}/firmware/bcm/*/*.bin ${base_libdir}/firmware/bcm/*/*.cal ${sysconfdir}/firmware/" FILES_${PN}-scfw = "${base_libdir}/firmware/scfw/" +FILES_${PN}-sdma = " ${base_libdir}/firmware/imx/sdma" COMPATIBLE_MACHINE = "(imx)" -- 2.40.1