5 files changed, 9 insertions, 9 deletions

diff --git a/.github/workflows/backport.yaml b/.github/workflows/backport.yaml
index 432453011..54dce5bc0 100644
--- a/.github/workflows/backport.yaml
+++ b/.github/workflows/backport.yaml
@@ -1,6 +1,6 @@
 name: Backport labeled merged pull requests
 on:
-  pull_request:
+  pull_request_target:
     types: [closed]
   issue_comment:
     types: [created]
@@ -12,11 +12,11 @@ jobs:
     # or when a comment containing `/backport` is created
     if: >
       (
-        github.event_name == 'pull_request' &&
-        github.event.pull_request.merged
+        github.event_name == 'pull_request_target' &&
+        github.event.pull_request_target.merged
       ) || (
         github.event_name == 'issue_comment' &&
-        github.event.issue.pull_request &&
+        github.event.issue.pull_request_target &&
         contains(github.event.comment.body, '/backport')
       )
     steps:
diff --git a/recipes-bsp/u-boot/u-boot-imx-common.inc b/recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc
index f1edc92cb..2abcac9bb 100644
--- a/recipes-bsp/u-boot/u-boot-imx-common.inc
+++ b/recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc
@@ -3,9 +3,9 @@ DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRCBRANCH = "imx_v2020.04_5.4.70_2.3.0"
+SRCBRANCH = "lf_v2021.04"
 SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}"
-SRCREV = "185bdaaaf5644319284566e5c340927d28954a1a"
+SRCREV = "3463140881c523e248d2fcb6bfc9ed25c0db93bd"
 
 DEPENDS += "flex-native bison-native bc-native dtc-native"
 
@@ -14,7 +14,7 @@ B = "${WORKDIR}/build"
 
 inherit fsl-u-boot-localversion
 
-LOCALVERSION ?= "-imx_v2020.04_5.4.70_2.3.2"
+LOCALVERSION ?= "-imx_v2021.04_5.10.35_2.0.0"
 
 BOOT_TOOLS = "imx-boot-tools"
 
diff --git a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2020.04.bb b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb
index 2b296c192..2b296c192 100644
--- a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2020.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb
diff --git a/recipes-bsp/u-boot/u-boot-imx_2020.04.bb b/recipes-bsp/u-boot/u-boot-imx_2021.04.bb
index 058229e27..40772e2b0 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2020.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2021.04.bb
@@ -3,7 +3,7 @@
 # Copyright (C) 2017-2021 NXP
 
 require recipes-bsp/u-boot/u-boot.inc
-require u-boot-imx-common.inc
+require u-boot-imx-common_${PV}.inc
 
 PROVIDES += "u-boot"
 
diff --git a/recipes-extended/tsntool/tsntool_git.bb b/recipes-extended/tsntool/tsntool_git.bb
index 94091db8a..8ef79d27c 100644
--- a/recipes-extended/tsntool/tsntool_git.bb
+++ b/recipes-extended/tsntool/tsntool_git.bb
@@ -8,7 +8,7 @@ DEPENDS = "cjson libnl readline"
 inherit pkgconfig
 
 SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/tsntool;protocol=https;nobranch=1"
-SRCREV = "1d1686e83c8f83472055189c278b837434990dcc"
+SRCREV = "3111f7f79e7d1b1a5e60f37fe76785559b2d0360"
 
 S = "${WORKDIR}/git"