Re: [U-Boot] Merge conflicts between ARM and mainline U-Boot trees

On Tuesday, April 08, 2014 at 09:49:17 AM, Albert ARIBAUD wrote:

Hello all,

There are four merge conflicts currently between ARM and mainline.

I have created a 'merged' branch on the ARM repository with what I think the resolutions should be. Some are trivial, others, less.

Could commit authors and/or custodians (CC:ed) please confirm or indicate correct resolutions?

Overall resolutions can be seen (assuming your remote for the ARM tree is 'u-boot-arm'

git fetch git://git.denx.de/u-boot-arm merged:arm-merged git show arm-merged

Resolutions, from the most to the least trivial:

arch/arm/cpu/arm926ejs/mxs/Makefile:

• commits 1a9df13d and b97241b3 (both Marek)

What was the problem here ... the MKIMAGE/UIMAGE change, right? Looks correct. Best regards, Marek Vasut