Simon, Applied to u-boot-tegra/master, then I rebased against u-boot/master and uploaded it back to denx.de/u-boot-tegra/master. ./MAKEALL -s tegra works OK. I didn't test on any real HW - my nyan-big system is offline temporarily.
PTAL and let me know if it's working OK and I'll get a PR out to TomR first thing next week. Tom > -----Original Message----- > From: s...@google.com [mailto:s...@google.com] On Behalf Of Simon Glass > Sent: Friday, June 05, 2015 9:25 AM > To: Tom Warren > Cc: U-Boot Mailing List; Jagannadha Sutradharudu Teki; Stephen Warren; > Marek Vasut; Pavel Herrmann; Stephen Warren > Subject: Re: [PATCH v2 00/16] tegra: Expand Nyan-big support > > Hi Tom, > > On 4 June 2015 at 10:22, Tom Warren <twar...@nvidia.com> wrote: > > Simon, > > > > Tried applying your patchset. Two or three had minor 'git am' conflicts that > were easy to resolve with 'patch', but #11 (tegra: Allow board-specific init) > conflicts with Mashiro's move of board.c to board2.c in mach-tegra: > > > > Author: Masahiro Yamada <yamada.masah...@socionext.com> > > Date: Mon Apr 13 10:51:14 2015 +0900 > > > > ARM: tegra: move NVIDIA common files to arch/arm/mach-tegra > > > > Please rebase your patches against current TOT u-boot-tegra/master and let > me know when they're up on patchwork and I'll retry. > > > > OK I'm just running a test now and will get this out this morning. > > Regards, > Simon > > > Thanks, > > > > Tom > > > >> -----Original Message----- > >> From: s...@google.com [mailto:s...@google.com] On Behalf Of Simon Glass > >> Sent: Thursday, June 04, 2015 8:46 AM > >> To: Tom Warren > >> Cc: U-Boot Mailing List; Jagannadha Sutradharudu Teki; Stephen > >> Warren; Marek Vasut; Pavel Herrmann; Stephen Warren > >> Subject: Re: [PATCH v2 00/16] tegra: Expand Nyan-big support > >> > >> Hi Tom, > >> > >> On 4 June 2015 at 09:42, Tom Warren <twar...@nvidia.com> wrote: > >> > > >> > Sorry, I've been busy with T210 stuff. I'll try to take a look at > >> > it before the > >> EOW. > >> > > >> > >> Great to see progress on T210. > >> > >> > IIRC, there was some push-back from Stephen on boot scripts, etc. > >> > Have > >> these concerns all been addressed? Have you gotten Acks? > >> > > >> > >> No the boot script patch is the one that should be left out. I talked > >> to Stephen about it - there are some things we could do, but not in > >> the timeframe of this release. > >> > >> Regards, > >> Simon > >> > >> > Tom > >> > > >> > > -----Original Message----- > >> > > From: s...@google.com [mailto:s...@google.com] On Behalf Of Simon > >> > > Glass > >> > > Sent: Thursday, June 04, 2015 8:16 AM > >> > > To: U-Boot Mailing List > >> > > Cc: Simon Glass; Tom Warren; Jagannadha Sutradharudu Teki; > >> > > Stephen Warren; Marek Vasut; Pavel Herrmann; Stephen Warren > >> > > Subject: Re: [PATCH v2 00/16] tegra: Expand Nyan-big support > >> > > > >> > > Hi Tom, > >> > > > >> > > On 13 May 2015 at 07:45, Simon Glass <s...@chromium.org> wrote: > >> > > > This series expands Nyan-big support: > >> > > > > >> > > > - Enable Chrome OS EC, so that the keyboard works > >> > > > - Add some extra clock and pre-kernel init required for > >> > > > reliable operation > >> > > > - Add Chrome OS environment variables, including 'run nvboot' > >> > > > to allow booting Chrome OS more easily > >> > > > > >> > > > Still missing are audio and USB. > >> > > > > >> > > > Changes in v2: > >> > > > - Use spi-max-frequency in both the bus and slave nodes > >> > > > - Remove unnecessary ODMDATA mangling > >> > > > - Use existing __stringify() macro > >> > > > - Drop tegra timer patch as it is not needed > >> > > > - Drop a few patches that have already been applied > >> > > > > >> > > > Doug Anderson (1): > >> > > > Add Chrome OS config header > >> > > > >> > > Apart from the above patch, can this series be applied please? > >> > > > >> > > > > >> > > > Simon Glass (15): > >> > > > tegra: cros_ec: Add tegra support for Chrome OS EC > >> > > > tegra: spi: Drop the claim_bus() method to correct delays > >> > > > dm: tegra: cros_ec: Enable Chrome OS EC on Nyan-big > >> > > > tegra: spi: Support slow SPI rates > >> > > > tegra: clock: Support enabling external clocks > >> > > > tegra: clock: Adjust PLL access to avoid a warning > >> > > > tegra: Introduce SRAM repair on tegra124 > >> > > > tegra: Add missing tegra124 peripherals > >> > > > tegra: Increase maximum arguments to 32 > >> > > > tegra: lcd: Tidy up clock init > >> > > > tegra: Allow board-specific init > >> > > > tegra: nyan-big: Add additional clock and kernel init > >> > > > tegra: config: Allow Chrome OS environment settings to be included > >> > > > tegra: Replace 'Norrin' with 'Nyan-big' and fix typo > >> > > > tegra: config: nyan-big: Add options required by Chrome OS > >> > > > boot > >> > > > > >> > > > arch/arm/dts/tegra124-nyan-big.dts | 3 + > >> > > > arch/arm/include/asm/arch-tegra/clock.h | 8 + > >> > > > arch/arm/include/asm/arch-tegra/sys_proto.h | 7 + > >> > > > arch/arm/include/asm/arch-tegra124/clock-tables.h | 12 +- > >> > > > arch/arm/include/asm/arch-tegra124/flow.h | 12 + > >> > > > arch/arm/mach-tegra/clock.c | 24 +- > >> > > > arch/arm/mach-tegra/powergate.c | 20 +- > >> > > > arch/arm/mach-tegra/tegra124/Kconfig | 2 +- > >> > > > arch/arm/mach-tegra/tegra124/clock.c | 2 +- > >> > > > board/nvidia/common/board.c | 8 +- > >> > > > board/nvidia/nyan-big/MAINTAINERS | 2 +- > >> > > > board/nvidia/nyan-big/nyan-big.c | 69 ++++ > >> > > > configs/nyan-big_defconfig | 5 + > >> > > > drivers/spi/tegra114_spi.c | 40 +- > >> > > > drivers/video/tegra124/tegra124-lcd.c | 4 +- > >> > > > include/configs/chromeos.h | 457 > >> ++++++++++++++++++++++ > >> > > > include/configs/nyan-big.h | 9 + > >> > > > include/configs/tegra-common-post.h | 15 +- > >> > > > include/configs/tegra-common.h | 2 +- > >> > > > 19 files changed, 663 insertions(+), 38 deletions(-) create > >> > > > mode > >> > > > 100644 include/configs/chromeos.h > >> > > > > >> > > > -- > >> > > > 2.2.0.rc0.207.ga3a616c > >> > > > > >> > > > >> > > Regards, > >> > > Simon > >> > -- > >> > nvpublic _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot