[U-Boot] [PATCH v3 6/6] mx25pdk: Add Ethernet support

[Stefano Babic]

On 08/12/2012 12:12, Albert ARIBAUD wrote:
> Hi Fabio,
> 
> On Tue, 23 Oct 2012 14:34:53 -0200, Fabio Estevam
> <fabio.estevam at freescale.com> wrote:
> 
>> mx25pdk has a Ethernet port that is connected to its internal FEC controller.
>>
>> In order to power up the Ethernet PHY (DP83640) it is necessary to communicate
>> with the MC34704 PMIC via I2C.
>>
>> Make the FEC ethernet port functional
>>
>> Signed-off-by: Fabio Estevam <fabio.estevam at freescale.com>
> 
> This commit introduced a dependency on the PMIC framework, which has
> since been reworked in u-boot/master, leading to a failure to merge
> u-boot-arm/master and u-boot/master properly.
> 
> Fabio, can you look into this?
> 

Hi Fabio, hi Albert,

I have already found this conflict and fixed it (I hope). Fabio, to have
a look, I pushed a temporary "master_merge" branch on u-boot-imx. If
everything is fine, I will push the changes in the master branch as usual.

> Stefano, can you add the resulting fix, if any, to the woodburn fixes?

I hope I have already done without breaking anything.

Best regards,
Stefano

-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================