topic patch apply error in i.MX Processors

patch apply error

Enuwai — Mon, 20 Feb 2023 03:10:18 GMT

I got the following error when applying the patch in section 5.2 of AN12195.

$ git apply 0002-Add-remote-core-share-memory-driver.patch 0002-Add-remote-core-share-memory-driver.patch:1277: trailing whitespace. error: patch failed: drivers/mxc/Makefile:10 error: drivers/mxc/Makefile: patch does not apply $

The target Linux version is L4.9.51.
I used the file attached to AN12195SW for the patch.

Re: patch apply error

joanxie — Mon, 20 Feb 2023 09:00:56 GMT

this patch is for 4.9.88, pls upgrade your bsp to test again

Re: patch apply error

Enuwai — Mon, 20 Feb 2023 11:20:15 GMT

Hi Joanxie,

thank you for your reply.
Build passed with imx_4.9.88_2.0.0_ga.
In AN12195, chapter 5.1.1, the linux-imx branch is now imx_4.9.51_imx8m_ga, but is it correct imx_4.9.88_2.0.0_ga?

Best Regards

Re: patch apply error

joanxie — Wed, 22 Feb 2023 03:04:17 GMT

you can find that the patch name is imx_4.9.88_2.0.0_ga_patches, so the SW we released are for 4.9.88, document is just for an example

Re: patch apply error

RachelGomez123 — Tue, 28 Feb 2023 09:08:53 GMT

Troubleshoot Git Patch Error: patch does not apply
This error occurs when Git can not determine how to apply your patch. Below is a command you can use to fix this error.

git apply --reject --whitespace=fix mychanges.patch
Note the --reject argument. We use it to instruct Git to patch the files it can and create a .rej file containing what it cannot figure out how to patch.

Then, you can manually resolve the conflicts. Alternatively, you can use the command below.

git apply --ignore-space-change --ignore-whitespace mypatch.patch

Regards,

Rachel Gomez