Merge pull request #828 from thochstein/imx-boot_firmware-imx

Upgrade imx-boot, firmware-imx for 5.10-35-2.0.0

6 files changed, 7 insertions, 21 deletions

diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.10.1.inc b/recipes-bsp/firmware-imx/firmware-imx-8.12.inc
index 582beb18..b9699a86 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8.10.1.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx-8.12.inc
@@ -3,14 +3,14 @@
 # Copyright (C) 2018 O.S. Systems Software LTDA.
 SECTION = "base"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3c3fe2b904fd694f28d2f646ee16dddb"
+LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b"
 
 SRC_URI = " \
     ${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \
 "
 
-SRC_URI[md5sum] = "1a9414928c3f30e7a911700fe83cd62e"
-SRC_URI[sha256sum] = "da415c32063c08fce8f52734f198b19ab06bd7d4333a4df900f8831df562f8fc"
+SRC_URI[md5sum] = "6062247e9f12f3ec27247079e59fb935"
+SRC_URI[sha256sum] = "6b6747bf36ecc53e385234afdce01f69c5775adf0d6685c885281ca6e4e322ef"
 
 S = "${WORKDIR}/firmware-imx-${PV}"
 
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8_8.10.1.bb b/recipes-bsp/firmware-imx/firmware-imx-8_8.12.bb
index 650c1cfd..650c1cfd 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8_8.10.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx-8_8.12.bb
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8m_8.10.1.bb b/recipes-bsp/firmware-imx/firmware-imx-8m_8.12.bb
index a48356ed..a48356ed 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8m_8.10.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx-8m_8.12.bb
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.10.1.bb b/recipes-bsp/firmware-imx/firmware-imx_8.12.bb
index 8ff4a321..8ff4a321 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_8.10.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_8.12.bb
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.bb b/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
index 4e154f6d..f9943342 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
@@ -1,5 +1,5 @@
 # Copyright (C) 2016 Freescale Semiconductor
-# Copyright (C) 2017-2020 NXP
+# Copyright (C) 2017-2021 NXP
 
 require imx-mkimage_git.inc
 
@@ -12,18 +12,11 @@ inherit deploy native
 
 CFLAGS = "-O2 -Wall -std=c99 -I ${STAGING_INCDIR} -L ${STAGING_LIBDIR}"
 
-REV_CHIP ?= "B0"
-REV_CHIP_mx8qxp = \
-    "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'B0', \
-                                                           'C0', d)}"
-
 do_compile () {
     cd ${S}
     oe_runmake clean
     oe_runmake bin
     oe_runmake -C iMX8M -f soc.mak mkimage_imx8
-    oe_runmake -C iMX8QM REV=${REV_CHIP} -f soc.mak imx8qm_dcd.cfg.tmp
-    oe_runmake -C iMX8QX REV=${REV_CHIP} -f soc.mak imx8qx_dcd.cfg.tmp
 }
 
 do_install () {
@@ -32,9 +25,3 @@ do_install () {
     install -m 0755 iMX8M/mkimage_imx8 ${D}${bindir}/mkimage_imx8m
     install -m 0755 mkimage_imx8 ${D}${bindir}/mkimage_imx8
 }
-
-do_deploy () {
-    install -m 0644 ${S}/iMX8QM/imx8qm_dcd.cfg.tmp ${DEPLOYDIR}
-    install -m 0644 ${S}/iMX8QX/imx8qx_dcd.cfg.tmp ${DEPLOYDIR}
-}
-addtask deploy before do_build after do_install
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
index e52fd722..1288d877 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
@@ -1,13 +1,12 @@
-# Copyright 2017-2020 NXP
+# Copyright 2017-2021 NXP
 
 DEPENDS = "zlib-native openssl-native"
 
-SRCBRANCH = "imx_5.4.70_2.3.0"
+SRCBRANCH = "lf-5.10.y_2.0.0"
 SRC_URI = "git://source.codeaurora.org/external/imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \
            file://0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch \
 "
-
-SRCREV = "8947fea369ab3932259630232cfb9f87b8f9dda1"
+SRCREV = "5138add7602a50d1730a54d0b67219f0ce0666b4"
 S = "${WORKDIR}/git"
 
 BOOT_TOOLS = "imx-boot-tools"