mbox

[U-Boot] Please pull u-boot-sunxi.git/next

Message ID 1404847240.11945.20.camel@hastur.hellion.org.uk
State Superseded
Delegated to: Albert ARIBAUD
Headers show

Pull-request

git://git.denx.de/u-boot-sunxi.git next

Message

Ian Campbell July 8, 2014, 7:20 p.m. UTC
Hi Tom

Sending to you for #next in Albert's absence.

The following changes since commit 23f23f23d509e8e873797884456070c8a47d72b2:

  socfpga: Relocate arch common functions away from board (2014-07-05 10:14:46 +0200)

are available in the git repository at:

  git://git.denx.de/u-boot-sunxi.git next

for you to fetch changes up to 799aff38dfc1b2d860ec8430572f9402d3ce9881:

  sunxi: Avoid unused variable warning. (2014-07-08 07:45:06 +0100)

----------------------------------------------------------------
Chen-Yu Tsai (1):
      sunxi: Add support for using MII phy-s with the GMAC nic

Hans de Goede (8):
      sunxi: mksunxiboot: Fix loading of files with a size which is not a multiple of 4
      sunxi: Fix u-boot-spl.lds to refer to .vectors
      sunxi: Remove mmc DMA support
      sunxi: Implement reset_cpu
      sunxi: Add sun4i support
      sunxi: Add sun5i support
      sunxi: Add emac glue, enable emac on the cubieboard
      sunxi: Add Ian Campbell and Hans de Goede as cubietruck board-maintainers

Ian Campbell (1):
      sunxi: Avoid unused variable warning.

Stefan Roese (1):
      net: Rename and cleanup sunxi (Allwinner) emac driver

 arch/arm/cpu/armv7/sunxi/Makefile           |   4 +
 arch/arm/cpu/armv7/sunxi/board.c            |  31 +++++-
 arch/arm/cpu/armv7/sunxi/cpu_info.c         |  15 +++
 arch/arm/cpu/armv7/sunxi/dram.c             | 102 +++++++++++++++++++-
 arch/arm/cpu/armv7/sunxi/u-boot-spl.lds     |   1 +
 arch/arm/include/asm/arch-sunxi/timer.h     |   5 +
 board/sunxi/Makefile                        |   3 +
 board/sunxi/dram_a13_oli_micro.c            |  32 +++++++
 board/sunxi/dram_cubieboard.c               |  31 ++++++
 board/sunxi/dram_r7dongle.c                 |  31 ++++++
 board/sunxi/gmac.c                          |  11 +++
 boards.cfg                                  |   7 +-
 drivers/mmc/sunxi_mmc.c                     | 141 ++--------------------------
 drivers/net/Makefile                        |   2 +-
 drivers/net/{sunxi_wemac.c => sunxi_emac.c} | 140 ++++++++++++++-------------
 include/configs/sun4i.h                     |  23 +++++
 include/configs/sun5i.h                     |  23 +++++
 include/configs/sunxi-common.h              |   8 +-
 include/netdev.h                            |   2 +-
 tools/mksunxiboot.c                         |  10 +-
 20 files changed, 401 insertions(+), 221 deletions(-)
 create mode 100644 board/sunxi/dram_a13_oli_micro.c
 create mode 100644 board/sunxi/dram_cubieboard.c
 create mode 100644 board/sunxi/dram_r7dongle.c
 rename drivers/net/{sunxi_wemac.c => sunxi_emac.c} (78%)
 create mode 100644 include/configs/sun4i.h
 create mode 100644 include/configs/sun5i.h

Comments

Jeroen Hofstee July 8, 2014, 9:30 p.m. UTC | #1
On 08-07-14 21:20, Ian Campbell wrote:
> Hi Tom
>
> Sending to you for #next in Albert's absence.
>
> The following changes since commit 23f23f23d509e8e873797884456070c8a47d72b2:
>
>    socfpga: Relocate arch common functions away from board (2014-07-05 10:14:46 +0200)
>
> are available in the git repository at:
>
>    git://git.denx.de/u-boot-sunxi.git next
>
> for you to fetch changes up to 799aff38dfc1b2d860ec8430572f9402d3ce9881:
>
>    sunxi: Avoid unused variable warning. (2014-07-08 07:45:06 +0100)
>

I am a bit lost here, why do want to send next branches for
pull requests??

Regards,
Jeroen
Ian Campbell July 9, 2014, 6:58 a.m. UTC | #2
On Tue, 2014-07-08 at 23:30 +0200, Jeroen Hofstee wrote:
> On 08-07-14 21:20, Ian Campbell wrote:
> > Hi Tom
> >
> > Sending to you for #next in Albert's absence.
> >
> > The following changes since commit 23f23f23d509e8e873797884456070c8a47d72b2:
> >
> >    socfpga: Relocate arch common functions away from board (2014-07-05 10:14:46 +0200)
> >
> > are available in the git repository at:
> >
> >    git://git.denx.de/u-boot-sunxi.git next
> >
> > for you to fetch changes up to 799aff38dfc1b2d860ec8430572f9402d3ce9881:
> >
> >    sunxi: Avoid unused variable warning. (2014-07-08 07:45:06 +0100)
> >
> 
> I am a bit lost here, why do want to send next branches for
> pull requests??

I discussed this with Albert on IRC and he said:

        aaribaud: ijc: Re: next branches, you could push to next and
        send a PR for my next indeed.
        
Ian.
Ian Campbell July 16, 2014, 7:31 p.m. UTC | #3
On Tue, 2014-07-08 at 20:20 +0100, Ian Campbell wrote:
> Hi Tom
> 
> Sending to you for #next in Albert's absence.

Since the release is now out I'll prepare a PR for master once Albert is
back. I've marked this as superceded in pw.

Ian.