public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Stephen Warren <swarren@wwwdotorg.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2] ARM: tegra: Add support for norrin board
Date: Mon, 04 Aug 2014 12:58:49 -0600	[thread overview]
Message-ID: <53DFD7E9.20406@wwwdotorg.org> (raw)
In-Reply-To: <20140804183813.GB30474@nvidia.com>

On 08/04/2014 12:38 PM, Allen Martin wrote:
> On Thu, Jul 31, 2014 at 04:21:43PM -0700, Stephen Warren wrote:
>> On 07/31/2014 05:14 PM, Allen Martin wrote:
>>> Norrin (PM370) is a Tegra124 clamshell board that is very similar to
>>> venice2, but it has a different panel, the sdcard cd and wp sense are
>>> flipped, and it has a different revision of the AS3722 PMIC.  This
>>> board is also refered to as "nyan" in the ChromeOS trees.
>>
>> At a *very* quick glance, this looks OK. But, you'll need to do a bit of
>> work to rebase it onto the latest u-boot/master. Kconfig has been
>> introduced now, so you'll need to do at least:
>>
>> * Don't touch boards.cfg (it's been removed)
>> * Add configs/norrin_defconfig
>> * Add board/nvidia/norrin/MAINTAINERS
>>
>> I think that's it.
>
> I based the patch on u-boot-tegra/master, is there a tegra branch that
> has already been rebased?  Or has the upstream workflow changed, so
> we're not collecting patches on u-boot-tegra for next merge window?

Anything that gets applied will eventually have to merge with what's 
upstream from u-boot-tegra/master, so it's best to base patches on the 
main U-Boot repo rather than the Tegra repo, perhaps with the addition 
of any relevant patches from other trees that will get into the main 
U-Boot repo before your patches. The only exception would be small 
changes/fixes that you know are going into u-boot-tegra/master very 
quickly, during a time period when Tom is actively applying patches for 
a current pull request.

When Tom isn't actively applying patches to u-boot-tegra/master, that 
branch will sit still, containing the content of the previous pull 
request. It might stay in that state for a while, as u-boot/master etc. 
all advance. When Tom starts applying patches for a new pull request, 
he'll then update u-boot-tegra/master to start at some upstream point 
(which will pull in all the new upstream work) and then apply your 
patches. If your patches aren't based on that new upstream already, they 
won't apply correctly, and you or Tom will have to rebase them at that time.

  reply	other threads:[~2014-08-04 18:58 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-31 23:14 [U-Boot] [PATCH v2] ARM: tegra: Add support for norrin board Allen Martin
2014-07-31 23:21 ` Stephen Warren
2014-08-04 18:38   ` Allen Martin
2014-08-04 18:58     ` Stephen Warren [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-11-11 19:04 Simon Glass
2014-11-12 18:57 ` Stephen Warren
2014-11-12 19:35   ` Simon Glass
2014-11-12 18:59 ` Stephen Warren
2014-11-12 19:33   ` Simon Glass

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=53DFD7E9.20406@wwwdotorg.org \
    --to=swarren@wwwdotorg.org \
    --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