From 9d5f40a8506a24ddf9e873331b30c41519e6f7b0 Mon Sep 17 00:00:00 2001 From: Cristinel Panfir Date: Wed, 11 Dec 2019 11:54:09 +0200 Subject: [PATCH] firmware-imx: Upgrade to version 8.5 - Exclude "easrc" as this IP is only applicable for Nano Soc - Remove SECO implementation from firmware-imx recipe and use imx-seco to deploy the SECO firmware for i.MX 8QM/8QXP Signed-off-by: Cristinel Panfir --- ...are-imx-8.1.1.inc => firmware-imx-8.5.inc} | 6 +++--- ...e-imx-8_8.1.1.bb => firmware-imx-8_8.5.bb} | 2 -- ...imx-8m_8.1.1.bb => firmware-imx-8m_8.5.bb} | 0 .../firmware-imx/firmware-imx-8x_8.1.1.bb | 20 ------------------- ...mware-imx_8.1.1.bb => firmware-imx_8.5.bb} | 3 +++ 5 files changed, 6 insertions(+), 25 deletions(-) rename recipes-bsp/firmware-imx/{firmware-imx-8.1.1.inc => firmware-imx-8.5.inc} (60%) rename recipes-bsp/firmware-imx/{firmware-imx-8_8.1.1.bb => firmware-imx-8_8.5.bb} (87%) rename recipes-bsp/firmware-imx/{firmware-imx-8m_8.1.1.bb => firmware-imx-8m_8.5.bb} (100%) delete mode 100644 recipes-bsp/firmware-imx/firmware-imx-8x_8.1.1.bb rename recipes-bsp/firmware-imx/{firmware-imx_8.1.1.bb => firmware-imx_8.5.bb} (96%) diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.1.1.inc b/recipes-bsp/firmware-imx/firmware-imx-8.5.inc similarity index 60% rename from recipes-bsp/firmware-imx/firmware-imx-8.1.1.inc rename to recipes-bsp/firmware-imx/firmware-imx-8.5.inc index 33b9594a..ae6b1d78 100644 --- a/recipes-bsp/firmware-imx/firmware-imx-8.1.1.inc +++ b/recipes-bsp/firmware-imx/firmware-imx-8.5.inc @@ -3,15 +3,15 @@ # Copyright (C) 2018 O.S. Systems Software LTDA. SECTION = "base" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=fb0303e4ee8b0e71c094171e2272bd44" +LIC_FILES_CHKSUM = "file://COPYING;md5=6c12031a11b81db21cdfe0be88cac4b3" SRCBRANCH ?= "master" SRC_URI = " \ ${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \ " -SRC_URI[md5sum] = "b494c9a2ba9f8906de73ac33068789a2" -SRC_URI[sha256sum] = "c115d5d0d115fc14754671bd2428f672f9f99677988588accef2fbca2c3f749c" +SRC_URI[md5sum] = "a6b926d087e1e642580da8a6d982abe6" +SRC_URI[sha256sum] = "45b0a7392e7a4b2e6c7e1cb988dd660ff3f8cd465afdf796ff840a00db08389d" S = "${WORKDIR}/firmware-imx-${PV}" diff --git a/recipes-bsp/firmware-imx/firmware-imx-8_8.1.1.bb b/recipes-bsp/firmware-imx/firmware-imx-8_8.5.bb similarity index 87% rename from recipes-bsp/firmware-imx/firmware-imx-8_8.1.1.bb rename to recipes-bsp/firmware-imx/firmware-imx-8_8.5.bb index d99aa41b..64fa2885 100644 --- a/recipes-bsp/firmware-imx/firmware-imx-8_8.1.1.bb +++ b/recipes-bsp/firmware-imx/firmware-imx-8_8.5.bb @@ -13,8 +13,6 @@ do_deploy() { install -m 0644 ${S}/firmware/hdmi/cadence/hdmitxfw.bin ${DEPLOYDIR} install -m 0644 ${S}/firmware/hdmi/cadence/hdmirxfw.bin ${DEPLOYDIR} install -m 0644 ${S}/firmware/hdmi/cadence/dpfw.bin ${DEPLOYDIR} - # SECO - install -m 0644 ${S}/firmware/seco/mx8qm-ahab-container.img ${DEPLOYDIR} } addtask deploy after do_install before do_build diff --git a/recipes-bsp/firmware-imx/firmware-imx-8m_8.1.1.bb b/recipes-bsp/firmware-imx/firmware-imx-8m_8.5.bb similarity index 100% rename from recipes-bsp/firmware-imx/firmware-imx-8m_8.1.1.bb rename to recipes-bsp/firmware-imx/firmware-imx-8m_8.5.bb diff --git a/recipes-bsp/firmware-imx/firmware-imx-8x_8.1.1.bb b/recipes-bsp/firmware-imx/firmware-imx-8x_8.1.1.bb deleted file mode 100644 index 85d394a0..00000000 --- a/recipes-bsp/firmware-imx/firmware-imx-8x_8.1.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2018 NXP -SUMMARY = "Freescale i.MX firmware for 8X family" -DESCRIPTION = "Freescale i.MX firmware for 8X family" - -require firmware-imx-${PV}.inc - -inherit deploy - -do_install[noexec] = "1" - -do_deploy() { - # SECO - install -m 0644 ${S}/firmware/seco/mx8qx-ahab-container.img ${DEPLOYDIR} -} - -addtask deploy after do_install before do_build - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" - -COMPATIBLE_MACHINE = "(mx8x)" diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.1.1.bb b/recipes-bsp/firmware-imx/firmware-imx_8.5.bb similarity index 96% rename from recipes-bsp/firmware-imx/firmware-imx_8.1.1.bb rename to recipes-bsp/firmware-imx/firmware-imx_8.5.bb index 96a09e38..549a86e6 100644 --- a/recipes-bsp/firmware-imx/firmware-imx_8.1.1.bb +++ b/recipes-bsp/firmware-imx/firmware-imx_8.5.bb @@ -21,6 +21,9 @@ do_install() { cd firmware for d in *; do case $d in + easrc) + # excluding as only applies Nano SoC + ;; ddr|hdmi|seco) # These folders are for i.MX 8 and are included in the boot image via imx-boot bbnote Excluding folder $d -- 2.40.1