Please pull u-boot-sunxi.git/master

Hi Albert

Please pull from u-boot-sunxi.git/master for a set of patches adding AHCI, EHCI, PSCI support + support for 14 new boards.

The following changes since commit 9d195a546179bc732aba9eacccf0a9a3db591288:

ARM: HYP/non-sec: remove MIDR check to validate CBAR (2014-07-28 17:19:55 +0200)

are available in the git repository at:

http://git.denx.de/u-boot-sunxi.git master

for you to fetch changes up to 4854154002d92b3fc9fd708774cec7c04c954247:

sun7i: Add bananapi board (2014-07-30 10:23:07 +0200)

----------------------------------------------------------------
Hans de Goede (8):
sun4i: add USB EHCI settings
sun5i: add USB EHCI settings
sunxi: Enable EHCI on various sunxi boards
sunxi: Add CONFIG_MACPWR option
sun4i: Add support for a number of new sun4i boards
sun5i: Add support for a number of new sun5i boards
sun7i: Add support for a number of new sun7i boards
sun7i: Add bananapi board

Ian Campbell (2):
ahci: provide sunxi SATA driver using AHCI platform framework
cubieboard2: Enable AXP209 power controller

Marc Zyngier (2):
sunxi: HYP/non-sec: add sun7i PSCI backend
sunxi: HYP/non-sec: configure CNTFRQ on all CPUs

Roman Byshko (5):
sunxi: add defines to control USB Host clocks/resets
sunxi: add USB EHCI driver
sunxi: add general USB settings
sun7i: add USB EHCI settings
sun7i: cubietruck: enable USB EHCI

 arch/arm/cpu/armv7/sunxi/Makefile             |   3 +
 arch/arm/cpu/armv7/sunxi/board.c              |   5 +
 arch/arm/cpu/armv7/sunxi/clock_sun4i.c        |   4 +
 arch/arm/cpu/armv7/sunxi/psci.S               | 162 +++++++++++++++++++++
 arch/arm/include/asm/arch-sunxi/clock_sun4i.h |  15 +-
 board/sunxi/Makefile                          |  16 ++
 board/sunxi/ahci.c                            |  84 +++++++++++
 board/sunxi/dram_a10_olinuxino_l.c            |  31 ++++
 board/sunxi/dram_a10s_olinuxino_m.c           |  31 ++++
 board/sunxi/dram_a13_olinuxino.c              |  31 ++++
 board/sunxi/dram_bananapi.c                   |  31 ++++
 board/sunxi/dram_linksprite_pcduino3.c        |  31 ++++
 board/sunxi/dram_sun4i_360_1024_iow16.c       |  31 ++++
 board/sunxi/dram_sun4i_360_1024_iow8.c        |  31 ++++
 board/sunxi/dram_sun4i_360_512.c              |  31 ++++
 board/sunxi/dram_sun4i_384_1024_iow8.c        |  31 ++++
 board/sunxi/dram_sun7i_384_1024_iow16.c       |  31 ++++
 board/sunxi/dram_sun7i_384_512_busw16_iow16.c |  31 ++++
 boards.cfg                                    |  28 +++-
 drivers/block/ahci.c                          |  16 ++
 drivers/usb/host/Makefile                     |   1 +
 drivers/usb/host/ehci-sunxi.c                 | 201 ++++++++++++++++++++++++++
 include/ahci.h                                |   4 +
 include/configs/sun4i.h                       |  12 ++
 include/configs/sun5i.h                       |   5 +
 include/configs/sun7i.h                       |  19 +++
 include/configs/sunxi-common.h                |  18 +++
 27 files changed, 923 insertions(+), 11 deletions(-)
 create mode 100644 arch/arm/cpu/armv7/sunxi/psci.S
 create mode 100644 board/sunxi/ahci.c
 create mode 100644 board/sunxi/dram_a10_olinuxino_l.c
 create mode 100644 board/sunxi/dram_a10s_olinuxino_m.c
 create mode 100644 board/sunxi/dram_a13_olinuxino.c
 create mode 100644 board/sunxi/dram_bananapi.c
 create mode 100644 board/sunxi/dram_linksprite_pcduino3.c
 create mode 100644 board/sunxi/dram_sun4i_360_1024_iow16.c
 create mode 100644 board/sunxi/dram_sun4i_360_1024_iow8.c
 create mode 100644 board/sunxi/dram_sun4i_360_512.c
 create mode 100644 board/sunxi/dram_sun4i_384_1024_iow8.c
 create mode 100644 board/sunxi/dram_sun7i_384_1024_iow16.c
 create mode 100644 board/sunxi/dram_sun7i_384_512_busw16_iow16.c
 create mode 100644 drivers/usb/host/ehci-sunxi.c

Regards,

Hans
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Hi Tom, Albert, Hans,

I am afraid we are going to be in trouble with this pre-Kconfig based PR because it includes various new boards.

(We can fix the merge conflict,
but it is not trivial.)

How this is going to work?

Perhaps should we discard unmerged PRs and get all the subsystem repos synchronized with u-boot/master ?

Or shall we break these boards once and fix them in a follow-up patch ?

Quoted 6 lines · Masahiro Yamada

Hi Tom, Albert, Hans,

I am afraid we are going to be in trouble with this pre-Kconfig based PR because it includes various new boards.

Yeah, I was wondering how this would work!

Quoted 6 lines

(We can fix the merge conflict,
but it is not trivial.)

How this is going to work?

Quoted 7 lines

Perhaps should we discard unmerged PRs and get all the subsystem repos synchronized with u-boot/master ?

Or shall we break these boards once and fix them in a follow-up patch ?

Can you point us to the conversion script please?

(I say "us/we" here but I'm actually about to get on a plain and be AFK for several days, so I guess I mean "Hans" ;-))

With that script we could rebase onto the current branch base running the script at every step (including a new artificial step right before the top of the branch to pickup all the other boards) and commit --amend any new defconfigs which are produced.

Then rebase the result of that onto the current master, ignoring conflicts in boards.cfg (i.e. just deleting it each time).

The result should be a rebased tree where all the changes to boards.cfg are instead replicated in the appropriate defconfig.

Does that sound workable?

Quoted 6 lines · Masahiro Yamada

Hi Tom, Albert, Hans,

I am afraid we are going to be in trouble with this pre-Kconfig based PR because it includes various new boards.

Yeah, I was wondering how this would work!

Quoted 11 lines

(We can fix the merge conflict,
but it is not trivial.)

How this is going to work?

Perhaps should we discard unmerged PRs and get all the subsystem repos synchronized with u-boot/master ?

Quoted 2 lines

Or shall we break these boards once and fix them in a follow-up patch ?

Can you point us to the conversion script please?

(I say "us/we" here but I'm actually about to get on a plain and be AFK for several days, so I guess I mean "Hans" ;-))

With that script we could rebase onto the current branch base running the script at every step (including a new artificial step right before the top of the branch to pickup all the other boards) and commit --amend any new defconfigs which are produced.

Then rebase the result of that onto the current master, ignoring conflicts in boards.cfg (i.e. just deleting it each time).

The result should be a rebased tree where all the changes to boards.cfg are instead replicated in the appropriate defconfig.

Does that sound workable?

Hi Ian, Hans,

Quoted 21 lines · On Thu, 31 Jul 2014 08:54:09 +0100 Ian Campbell <[email protected]> wrote:

Quoted 6 lines · Masahiro Yamada

Hi Tom, Albert, Hans,

I am afraid we are going to be in trouble with this pre-Kconfig based PR because it includes various new boards.

Yeah, I was wondering how this would work!

Quoted 11 lines

(We can fix the merge conflict,
but it is not trivial.)

How this is going to work?

Perhaps should we discard unmerged PRs and get all the subsystem repos synchronized with u-boot/master ?

Quoted 4 lines

Quoted 2 lines

Or shall we break these boards once and fix them in a follow-up patch ?

Can you point us to the conversion script please?

Sure.

These are the conversion tools I used in my series:

http://patchwork.ozlabs.org/patch/374412/
for generating *_defconfig and Kconfig

http://patchwork.ozlabs.org/patch/374406/
for generating MAINTAINERS

I assume you have boards.cfg on your local branch.

If you run 'tools/genkconfig' and 'tools/gen_maintainers.py', *_defconfig, Kconfig, and MAINTAINERS will be generated for all the boards listed in the boards.cfg file.

And then commit --amend the diffs of *_defconfig, Kconfig, MAINTAINERS.