am57xx_evm_ti - patch does not apply

[gtortone]

Hi, I'm trying to compile u-boot v2016.05 for am57xx_evm_ti but build.sh exits with this error:

patch -p1 < "/Bootloader-Builder/patches/ti-2016.05/0001-beagle_x15-uEnv.txt-bootz-n-fixes.patch" Applying: beagle_x15: uEnv.txt, bootz, n fixes error: patch failed: include/configs/ti_armv7_common.h:59 error: include/configs/ti_armv7_common.h: patch does not apply error: patch failed: include/configs/ti_omap5_common.h:83 error: include/configs/ti_omap5_common.h: patch does not apply Patch failed at 0001 beagle_x15: uEnv.txt, bootz, n fixes The copy of the patch that failed is found in: /Bootloader-Builder/scratch/u-boot/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".

Could you help me ?

[RobertCNelson]

hi @gtortone just rebased it, https://github.com/RobertCNelson/Bootloader-Builder/commit/b3b5a215f51a79fe2a19e12977007f6dc336c278

git pull and it should build again..

https://travis-ci.org/RobertCNelson/Bootloader-Builder/builds/158823213

Regards,

[gtortone]

It works !

Thanks a lot !