public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
To: u-boot@lists.denx.de
Subject: [U-Boot] Pull request - arm/zynq v2
Date: Sat, 17 Aug 2013 17:42:22 +0200	[thread overview]
Message-ID: <20130817174222.6942214d@lilith> (raw)
In-Reply-To: <5208891C.7070701@monstr.eu>

Hi Michal,

On Mon, 12 Aug 2013 09:05:00 +0200, Michal Simek <monstr@monstr.eu>
wrote:

> Hi Albert,
> 
> please pull these 3 zynq patches to your arm tree.
> 
> There is still pending the arm: lds: Remove libgcc eabi exception handling tables
> patch. Have you considered to also add it?
> 
> v2:
> - Changed email address,
> - There was incorrect rebase which I have fixed - correct sha1 now
> 
> Thanks.
> Michal
> 
> 
> The following changes since commit a78dac79ede7fbb4c9e816abc879655540c3f076:
> 
>   nds32: fix the missing COBJS-y change (2013-08-09 01:51:24 +0800)
> 
> are available in the git repository at:
> 
>   git://www.denx.de/git/u-boot-microblaze.git zynq
> 
> for you to fetch changes up to 2d83d33a51926d6471eb9282d03d83783850d565:
> 
>   zynq: Enable axi ethernet and emaclite driver initialization (2013-08-12 08:59:56 +0200)
> 
> ----------------------------------------------------------------
> Michal Simek (3):
>       zynq: Add new ddrc driver for ECC support
>       zynq: slcr: Wait 100ms till clk is properly setup
>       zynq: Enable axi ethernet and emaclite driver initialization
> 
>  arch/arm/cpu/armv7/zynq/Makefile           |  1 +
>  arch/arm/cpu/armv7/zynq/ddrc.c             | 50 ++++++++++++++++++++++++++++++
>  arch/arm/cpu/armv7/zynq/slcr.c             |  2 +-
>  arch/arm/include/asm/arch-zynq/hardware.h  |  8 +++++
>  arch/arm/include/asm/arch-zynq/sys_proto.h |  1 +
>  board/xilinx/zynq/board.c                  | 19 ++++++++++++
>  6 files changed, 80 insertions(+), 1 deletion(-)
>  create mode 100644 arch/arm/cpu/armv7/zynq/ddrc.c

I cannot merge these three commits without merging a lot of nds32 stuff
too, apparently, and I don't want to. If this stuff is not needed for
the three commits, then please rebase them so that they don't pull
anything else in.

Amicalement,
-- 
Albert.

  reply	other threads:[~2013-08-17 15:42 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <520887BF.6060606@xilinx.com>
2013-08-12  7:05 ` [U-Boot] Pull request - arm/zynq v2 Michal Simek
2013-08-17 15:42   ` Albert ARIBAUD [this message]
2013-08-18 15:26     ` Tom Rini

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=20130817174222.6942214d@lilith \
    --to=albert.u.boot@aribaud.net \
    --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