From: Stefano Babic <sbabic@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 6/6] mx25pdk: Add Ethernet support
Date: Sat, 08 Dec 2012 12:27:16 +0100 [thread overview]
Message-ID: <50C32414.9010500@denx.de> (raw)
In-Reply-To: <20121208121249.5c3949e8@lilith>
On 08/12/2012 12:12, Albert ARIBAUD wrote:
> Hi Fabio,
>
> On Tue, 23 Oct 2012 14:34:53 -0200, Fabio Estevam
> <fabio.estevam@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@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
=====================================================================
next prev parent reply other threads:[~2012-12-08 11:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-23 16:34 [U-Boot] [PATCH v3 1/6] mx25pdk: Include CONFIG_MX25 Fabio Estevam
2012-10-23 16:34 ` [U-Boot] [PATCH v3 2/6] mx25pdk: Add esdhc support Fabio Estevam
2012-10-23 16:34 ` [U-Boot] [PATCH v3 3/6] pmic_fsl: Introduce FSL_PMIC_I2C_LENGTH Fabio Estevam
2012-10-23 16:34 ` [U-Boot] [PATCH v3 4/6] mic: Add support for mc34704 Fabio Estevam
2012-10-25 10:35 ` Stefano Babic
2012-10-25 10:55 ` Fabio Estevam
2012-10-25 12:02 ` Stefano Babic
2012-10-23 16:34 ` [U-Boot] [PATCH v3 5/6] mx25: Place common functions into sys_proto.h Fabio Estevam
2012-10-23 16:34 ` [U-Boot] [PATCH v3 6/6] mx25pdk: Add Ethernet support Fabio Estevam
2012-12-08 11:12 ` Albert ARIBAUD
2012-12-08 11:27 ` Stefano Babic [this message]
2012-12-08 19:34 ` Fabio Estevam
2012-12-11 16:46 ` Fabio Estevam
2012-10-28 11:50 ` [U-Boot] [PATCH v3 1/6] mx25pdk: Include CONFIG_MX25 Stefano Babic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50C32414.9010500@denx.de \
--to=sbabic@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox