[U-Boot] [PATCH v2 6/6] MX35: add support for woodburn board

[Stefano Babic]

On 08/12/2012 10:31, Albert ARIBAUD wrote:
> Hi Stefano,
> 

Hi Albert,

> On Thu, 11 Oct 2012 09:11:46 +0200, Stefano Babic <sbabic at denx.de>
> wrote:
> 
>> The woodburn board is based on the MX35 SOC.
>> Support for both external (NOR) and internal
>> (SD Card) boot mode are added. It uses the
>> generic SPL framework to implement the internal boot
>> mode.
>>
>> The following peripherals are supported:
>> - Ethernet (FEC)
>> - SD Card
>> - NAND (512 MB)
>> - NOR Flash
>>
>> In the internal boot mode, a simple imximage header
>> is generated to set the address in internal RAM
>> where the SOC must copy the SPL code. The initial setup
>> is then demanded to the SPL itself.
>>
>> Signed-off-by: Stefano Babic <sbabic at denx.de>
> 
> It seems this board uses the old PMIC framework, so it does not merge
> properly with u-boot/master which has switched to power in-between. Can
> you look into this?
> 
> I must say I'm not entirely sure how to handle this, but here is my
> proposal: AFAIU this patch was applied initially in your imx tree, so I
> suggest that you merge u-boot/master into your tree (with a comment to
> the effect that you need this to resolve PMIC vs POWER conflicts) or
> into an ad hoc branch, and resolve the conflicts there, then send a
> pull request to me for your resolved tree or branch.

There are conflicts with three boards : mx35pdk, woodburn and mx53loco.

It seems that a couple of patches were lost in the transition from pmic
to power, too:

commit 787f4f30823a15b1e45c0a0b901cfa5bd415e251
Author: Fabio Estevam <fabio.estevam at freescale.com>
Date:   Tue Oct 23 06:36:18 2012 +0000

    pmic: Add support for mc34704

    Add the register layout for the MC34704 PMIC from Freescale.

    Signed-off-by: Fabio Estevam <fabio.estevam at freescale.com>

commit 4cfc6c4fa7611e79e6434e97db56b6072ad4d05c
Author: Fabio Estevam <fabio.estevam at freescale.com>
Date:   Tue Oct 23 06:34:50 2012 +0000

    pmic_fsl: Introduce FSL_PMIC_I2C_LENGTH

I solved the conflicts in the way you suggested and I pushed a temporary
branch "master_merge" on u-boot-imx.

I am unsure, too, if this is the best way to solve these conflicts, but
if Tom agrees on our way to proceed, I will post a new pull request.

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
=====================================================================