Patch fails for imx8mn

[rktno]

After following https://github.com/SolidRun/meta-solidrun-arm-imx8/blob/zeus-imx8mn/README.md the bitbake core-image-minimal command fails:

ERROR: Logfile of failure stored in: /home/remko/imx-yocto/build-xwayland-imx8mnsolidrun/tmp/work/imx8mnsolidrun-poky-linux/u-boot-imx/1_2020.04-r0/temp/log.do_patch.21904
ERROR: Task (/home/remko/imx-yocto/sources/meta-imx/meta-bsp/recipes-bsp/u-boot/u-boot-imx_2020.04.bb:do_patch) failed with exit code '1'

The full log file is attached here: log.do_patch.21904.txt

    /home/remko/imx-yocto/sources/meta-imx/meta-bsp/recipes-bsp/u-boot/files/
NOTE: Applying patch '0001-Add-imx8mn-solidrun-configuration-files-to-u-boot.patch' (../sources/meta-solidrun-arm-imx8/recipes-bsp/u-boot/u-boot-imx/0001-Add-imx8mn-solidrun-configuration-files-to-u-boot.patch)
NOTE: self._current is None
NOTE: patches is [{'file': '/home/remko/imx-yocto/sources/meta-solidrun-arm-imx8/recipes-bsp/u-boot/u-boot-imx/0001-Add-imx8mn-solidrun-configuration-files-to-u-boot.patch', 'strippath': '1', 'filemd5': '10d4eceb7596bae0bcab2692312f8a9f'}]
NOTE: applying patch {'file': '/home/remko/imx-yocto/sources/meta-solidrun-arm-imx8/recipes-bsp/u-boot/u-boot-imx/0001-Add-imx8mn-solidrun-configuration-files-to-u-boot.patch', 'strippath': '1', 'filemd5': '10d4eceb7596bae0bcab2692312f8a9f'}
ERROR: Applying '0001-Add-imx8mn-solidrun-configuration-files-to-u-boot.patch' failed:
checking file arch/arm/mach-imx/imx8m/Kconfig
Hunk #1 FAILED at 106.
Hunk #2 succeeded at 146 (offset -18 lines).
1 out of 2 hunks FAILED

It fails at line 106 of 0001-Add-imx8mn-solidrun-configuration-files-to-u-boot.patch

[msbspastrana]

Hello,

It continues happening, at least if you are using the following sources:

• repo init -u https://source.codeaurora.org/external/imx/imx-manifest -b imx-linux-zeus -m imx-5.4.47-2.2.0.xml
• https://github.com/SolidRun/meta-solidrun-arm-imx8.git -b zeus-imx8mn
• https://github.com/SolidRun/imx8mp_build.git -b imx8mn

It fails after applying the first patch.