From 78802e3ecd139a5031c06821526f249e060894c1 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Mon, 17 Feb 2020 19:37:29 +0100
Subject: firmware: update to 4.14.98 2.3.1

The seco firmware is now split out of firmware-imx.
The seco firmware has now a i.MX8X B0 and C0 silicon version.

Related-to: ELB-2351
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 recipes-bsp/imx-mkimage/imx-boot_%.bbappend      | 58 +++++++++++++++++++++---
 recipes-bsp/imx-mkimage/imx-mkimage_git.bbappend | 18 +++++++-
 2 files changed, 68 insertions(+), 8 deletions(-)

(limited to 'recipes-bsp/imx-mkimage')

diff --git a/recipes-bsp/imx-mkimage/imx-boot_%.bbappend b/recipes-bsp/imx-mkimage/imx-boot_%.bbappend
index db891fc..2a840cb 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_%.bbappend
+++ b/recipes-bsp/imx-mkimage/imx-boot_%.bbappend
@@ -1,6 +1,27 @@
 ATF_MACHINE_NAME_mx8qxp = "bl31-imx8qx.bin"
-SRCBRANCH = "imx_4.14.98_2.0.0_ga"
-SRCREV = "dd0234001713623c79be92b60fa88bc07b07f24f"
+ATF_MACHINE_NAME_mx8mn = "bl31-imx8mn.bin"
+
+SECO_CHIP ?= "qmb0"
+SECO_CHIP_mx8qxp = "qxb0"
+SECO_CHIP_imx8qxpc0mek = "qxc0"
+SECO_CHIP_imx8qxpc0lpddr4arm2 = "qxc0"
+SECO_CHIP_mx8qxpc0 = "qxc0"
+
+SECO_FIRMWARE = "mx8${SECO_CHIP}-ahab-container.img"
+
+SOC_TARGET_mx8mn  = "iMX8MN"
+
+SRCBRANCH = "imx_4.14.98_2.3.0"
+SRCREV = "d7f9440dd5c050cc22cb362d53d4048e689a0c01"
+
+REV_CHIP ?= "B0"
+REV_CHIP_imx8qxpc0mek = "C0"
+REV_CHIP_imx8qxpc0lpddr4arm2 = "C0"
+REV_CHIP_mx8qxpc0 = "C0"
+
+IMX_EXTRA_FIRMWARE      = "firmware-imx-8 imx-sc-firmware imx-seco"
+IMX_EXTRA_FIRMWARE_mx8m = "firmware-imx-8m"
+IMX_EXTRA_FIRMWARE_mx8x = "firmware-imx-8x imx-sc-firmware imx-seco"
 
 compile_mx8m() {
     bbnote 8MQ/8MM boot binary build
@@ -16,13 +37,38 @@ compile_mx8m() {
     cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin
     cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME}                     ${BOOT_STAGING}/u-boot.bin
 }
+compile_mx8() {
+    bbnote 8QM boot binary build
+    cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${SC_FIRMWARE_NAME} ${BOOT_STAGING}/scfw_tcm.bin
+    cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin
+    cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME}                     ${BOOT_STAGING}/u-boot.bin
+    cp ${DEPLOY_DIR_IMAGE}/${SECO_FIRMWARE}                  ${BOOT_STAGING}
+}
+compile_mx8x() {
+    bbnote 8QX boot binary build
+    cp ${DEPLOY_DIR_IMAGE}/${SECO_FIRMWARE}                  ${BOOT_STAGING}
+    cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${SC_FIRMWARE_NAME} ${BOOT_STAGING}/scfw_tcm.bin
+    cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin
+    cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME}                     ${BOOT_STAGING}/u-boot.bin
+}
+do_compile() {
+    compile_${SOC_FAMILY}
+    # mkimage for i.MX8
+    for target in ${IMXBOOT_TARGETS}; do
+        bbnote "building ${SOC_TARGET} - ${target}"
+        make SOC=${SOC_TARGET} REV=${REV_CHIP} dtbs=${UBOOT_DTB_NAME} ${target}
+        if [ -e "${BOOT_STAGING}/flash.bin" ]; then
+            cp ${BOOT_STAGING}/flash.bin ${S}/${BOOT_CONFIG_MACHINE}-${target}
+        fi
+    done
+}
 deploy_mx8() {
     install -d ${DEPLOYDIR}/${BOOT_TOOLS}
-    install -m 0644 ${BOOT_STAGING}/mx8qm-ahab-container.img ${DEPLOYDIR}/${BOOT_TOOLS}
-    install -m 0755 ${S}/${TOOLS_NAME}                       ${DEPLOYDIR}/${BOOT_TOOLS}
+    install -m 0644 ${BOOT_STAGING}/${SECO_FIRMWARE} ${DEPLOYDIR}/${BOOT_TOOLS}
+    install -m 0755 ${S}/${TOOLS_NAME}               ${DEPLOYDIR}/${BOOT_TOOLS}
 }
 deploy_mx8x() {
     install -d ${DEPLOYDIR}/${BOOT_TOOLS}
-    install -m 0644 ${BOOT_STAGING}/mx8qx-ahab-container.img ${DEPLOYDIR}/${BOOT_TOOLS}
-    install -m 0755 ${S}/${TOOLS_NAME}                       ${DEPLOYDIR}/${BOOT_TOOLS}
+    install -m 0644 ${BOOT_STAGING}/${SECO_FIRMWARE} ${DEPLOYDIR}/${BOOT_TOOLS}
+    install -m 0755 ${S}/${TOOLS_NAME}               ${DEPLOYDIR}/${BOOT_TOOLS}
 }
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.bbappend b/recipes-bsp/imx-mkimage/imx-mkimage_git.bbappend
index 636494f..da59113 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.bbappend
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.bbappend
@@ -1,2 +1,16 @@
-SRCBRANCH = "imx_4.14.98_2.0.0_ga"
-SRCREV = "dd0234001713623c79be92b60fa88bc07b07f24f"
+SRCBRANCH = "imx_4.14.98_2.3.0"
+SRCREV = "d7f9440dd5c050cc22cb362d53d4048e689a0c01"
+
+REV_CHIP ?= "B0"
+REV_CHIP_imx8qxpc0mek = "C0"
+REV_CHIP_imx8qxpc0lpddr4arm2 = "C0"
+REV_CHIP_mx8qxpc0 = "C0"
+
+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
+}
-- 
cgit v1.2.3