On 13/03/2013 23:26, Albert ARIBAUD wrote:
On Wed, 13 Mar 2013 13:29:55 +0100, Albert ARIBAUD albert.u.boot@aribaud.net wrote:
Hi Stefano,
Hi Albert,
Regardless of applying the two patches above, there is a merge conflict between u-boot-imx/master and u-boot-arm/master between:
commit af73034c6ba131a93ed215098f43595637ef6ac3 ("led: Use STATUS_LED_ON and STATUS_LED_OFF when calling __led_set"), author Otavio Salvador otavio@ossystems.com.br, from the IMX tree, and
commit 4f47aceb118b291831a603d7e6ca651d76bf88e0 ("led: The gpio_led.c code expects that LED state is from the enum"), author Holger Hans Peter Freyther holger@freyther.de, from the TI tree through the ARM tree.
Actually, both commits are functionally exactly the same, Otavio's one being better only in that it causes smaller line widths.
I have merged the IMX tree with -Xtheirs so that the conflicts is automatically resolved in favor of Otavio's version.
Thanks for fixing that.
These failures also happen on IMX ToT before merge. Stefano, can you have a look? I can obviously not locate the actual faulty commit, as support for these boards appears only in the very last commit of the IMX branch.
Sorry for that - I have already seen patches from Fabio fixing that. I will test it and then I will send a pull request to fix it.
Best regards, Stefano