Re: [U-Boot] Merge conflict on Tegra SPI between u-boot/master and u-boot-arm/master

Hi Tom, > Just confirmed - in tegra20_sflash.c, remove the < HEAD section (#ifdef > CONFIG_OF_CONTROL + 2 lines), and keep the "tegra: spi remove non fdt > support" section (spi->slave.bus = bus + 4 lines). Ok, thanks a lot for confirming. I'll do the merge (and tests) accordingly on u-boot-a

Re: [U-Boot] Merge conflict on Tegra SPI between u-boot/master and u-boot-arm/master

Albert, On Thu, Mar 28, 2013 at 8:08 AM, Tom Warren wrote: > Albert, > > > On Thu, Mar 28, 2013 at 6:38 AM, Albert ARIBAUD > wrote: > >> Hello all, >> >> While preparing for an ARM PR, specifically a merge between commit >> 417c55803118eb8e350d5ab8ba6583fb39f4e2e3 (current u-boot/master ToT) >>

Re: [U-Boot] Merge conflict on Tegra SPI between u-boot/master and u-boot-arm/master

Albert, On Thu, Mar 28, 2013 at 6:38 AM, Albert ARIBAUD wrote: > Hello all, > > While preparing for an ARM PR, specifically a merge between commit > 417c55803118eb8e350d5ab8ba6583fb39f4e2e3 (current u-boot/master ToT) > and commit d53e340edf65ff253d3a7b06ebe60501045892e3 (current Tot for > u-boo

[U-Boot] Merge conflict on Tegra SPI between u-boot/master and u-boot-arm/master

Hello all, While preparing for an ARM PR, specifically a merge between commit 417c55803118eb8e350d5ab8ba6583fb39f4e2e3 (current u-boot/master ToT) and commit d53e340edf65ff253d3a7b06ebe60501045892e3 (current Tot for u-boot-arm/master), I hit the following merge conflicts: CONFLICT (content): Merg