imx8MP swupdate inquiry (do_patch error)

[kiyoung]

My environment is as follows.
i.MX Linux Yocto Project BSP 6.1.22_2.0.0 Release
NXP i.MX 8MPlus EVK (imx8mpevk)

Download the source according to AN13872, proceed with the patch, and run bitbake, an error occurs in the do_patch step.
Try to proceed with the source patch as mx8qxp, mx8mm, etc., but it seems to be because the corresponding files do not exist in the current environment.
I need to apply the patch corresponding to mx8mp. Can I get a patch that includes mx8mp?

[Manuel_Salas]

Hello @kiyoung 

Have you tried following this post?

Also, could you please share the exact steps to tr to replicate it by my side?

Best regards.

Salas.

[kiyoung]

Thanks for your reply.
In the posted document, "-b mickledore_6.1.36_2.1.0" is omitted at the end of "git clone https://github.com/nxp-imx-support/meta-swupdate-imx.git". For this reason, it seems to have been carried out by default.
Since there was no swupdate and including swupdate may have produced different results, I tried again from the beginning.

mkdir imx-yocto-bsp_sw
cd imx-yocto-bsp_sw
../bin/repo init -u https://github.com/nxp-imx/imx-manifest -b imx-linux-mickledore -m imx-6.1.22-2.0.0.xml
../bin/repo sync
cd sources/
git clone https://github.com/sbabic/meta-swupdate.git -b mickledore
git clone https://github.com/nxp-imx-support/meta-swupdate-imx.git -b mickledore_6.1.36_2.1.0
// patch by AN13872 (5.3 4~6)
DISTRO=fsl-imx-wayland MACHINE=imx8mp-lpddr4-evk source imx-setup-release.sh -b build-wayland
bitbake swupdate-image

An error occurs.

ERROR: u-boot-imx-2023.04-r0 do_patch: Applying patch '0006-imx93-default-env-lf-6.1.36-2.1.0.patch' on target directory '/home/kykwak/imx-yocto-bsp_sw/build-wayland/tmp/work/imx8mp_lpddr4_evk-poky-linux/u-boot-imx/2023.04-r0/git'
CmdError('quilt --quiltrc /home/kykwak/imx-yocto-bsp_sw/build-wayland/tmp/work/imx8mp_lpddr4_evk-poky-linux/u-boot-imx/2023.04-r0/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch 0006-imx93-default-env-lf-6.1.36-2.1.0.patch
patching file board/freescale/imx93_evk/imx93_evk.c
patching file include/configs/imx93_evk.h
Hunk #2 FAILED at 74.
Hunk #3 succeeded at 130 (offset -1 lines).
1 out of 3 hunks FAILED -- rejects in file include/configs/imx93_evk.h
Patch 0006-imx93-default-env-lf-6.1.36-2.1.0.patch does not apply (enforce with -f)

stderr: ')
ERROR: Logfile of failure stored in: /home/kykwak/imx-yocto-bsp_sw/build-wayland/tmp/work/imx8mp_lpddr4_evk-poky-linux/u-boot-imx/2023.04-r0/temp/log.do_patch.32540
ERROR: Task (/home/kykwak/imx-yocto-bsp_sw/sources/meta-imx/meta-bsp/recipes-bsp/u-boot/u-boot-imx_2023.04.bb:do_patch) failed with exit code '1'
NOTE: Tasks Summary: Attempted 1979 tasks of which 0 didn't need to be rerun and 1 failed.

Summary: 1 task failed:
/home/kykwak/imx-yocto-bsp_sw/sources/meta-imx/meta-bsp/recipes-bsp/u-boot/u-boot-imx_2023.04.bb:do_patch
Summary: There was 1 ERROR message, returning a non-zero exit code.