From mboxrd@z Thu Jan 1 00:00:00 1970 From: Albert ARIBAUD Date: Sat, 8 Dec 2012 10:31:30 +0100 Subject: [U-Boot] [PATCH v2 6/6] MX35: add support for woodburn board In-Reply-To: <1349939506-4109-7-git-send-email-sbabic@denx.de> References: <1349939506-4109-1-git-send-email-sbabic@denx.de> <1349939506-4109-7-git-send-email-sbabic@denx.de> Message-ID: <20121208103130.728275fc@lilith> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Stefano, On Thu, 11 Oct 2012 09:11:46 +0200, Stefano Babic 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 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. Tom, what do you think about this? Amicalement, -- Albert.