mbox

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

Message ID 53DA52FE.3030202@redhat.com
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Pull-request

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

Message

Hans de Goede July 31, 2014, 2:30 p.m. UTC 
Hi Albert

Note:

1) This superseeds my previous pull-req as that conflicted with the Kconfig changes
which have landed in u-boot/master, this pull-req replaces all the boards.cfg changes
from the previous series with defconfig changes / additions;

2) Since this new pull-req is intended to resolve conflicts with u-boot/master it
is based on u-boot/master rather then on u-boot-arm/master.

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 25b4adbba018633b943a99322bfb2fb819c0bafb:

  include: remove CONFIG_SPL/CONFIG_TPL definition in config headers (2014-07-30 14:42:03 -0400)

are available in the git repository at:

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

for you to fetch changes up to 3340eab26d89176dd0bf543e6d2590665c577423:

  sun7i: Add bananapi board (2014-07-31 15:37:24 +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/MAINTAINERS                       |  19 ++-
 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 ++++
 configs/A10-OLinuXino-Lime_defconfig          |   4 +
 configs/A10s-OLinuXino-M_defconfig            |   4 +
 configs/A13-OLinuXinoM_defconfig              |   2 +-
 configs/A13-OLinuXino_defconfig               |   4 +
 configs/A20-OLinuXino_MICRO_defconfig         |   4 +
 configs/Auxtek-T004_defconfig                 |   4 +
 configs/Bananapi_defconfig                    |   4 +
 configs/Cubieboard2_FEL_defconfig             |   2 +-
 configs/Cubieboard2_defconfig                 |   2 +-
 configs/Cubieboard_defconfig                  |   2 +-
 configs/Cubietruck_FEL_defconfig              |   2 +-
 configs/Cubietruck_defconfig                  |   2 +-
 configs/Linksprite_pcDuino3_defconfig         |   4 +
 configs/Mele_A1000G_defconfig                 |   4 +
 configs/Mele_A1000_defconfig                  |   4 +
 configs/Mini-X-1Gb_defconfig                  |   4 +
 configs/Mini-X_defconfig                      |   4 +
 configs/ba10_tv_box_defconfig                 |   4 +
 configs/i12-tvbox_defconfig                   |   4 +
 configs/qt840a_defconfig                      |   4 +
 configs/r7-tv-dongle_defconfig                |   2 +-
 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 +++
 48 files changed, 982 insertions(+), 13 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 configs/A10-OLinuXino-Lime_defconfig
 create mode 100644 configs/A10s-OLinuXino-M_defconfig
 create mode 100644 configs/A13-OLinuXino_defconfig
 create mode 100644 configs/A20-OLinuXino_MICRO_defconfig
 create mode 100644 configs/Auxtek-T004_defconfig
 create mode 100644 configs/Bananapi_defconfig
 create mode 100644 configs/Linksprite_pcDuino3_defconfig
 create mode 100644 configs/Mele_A1000G_defconfig
 create mode 100644 configs/Mele_A1000_defconfig
 create mode 100644 configs/Mini-X-1Gb_defconfig
 create mode 100644 configs/Mini-X_defconfig
 create mode 100644 configs/ba10_tv_box_defconfig
 create mode 100644 configs/i12-tvbox_defconfig
 create mode 100644 configs/qt840a_defconfig
 create mode 100644 drivers/usb/host/ehci-sunxi.c

Regards,

Hans

Comments

Masahiro Yamada Aug. 1, 2014, 1:54 a.m. UTC | #1 
Hi Hans,


On Thu, 31 Jul 2014 16:30:22 +0200
Hans de Goede <hdegoede@redhat.com> wrote:

> Hi Albert
> 
> Note:
> 
> 1) This superseeds my previous pull-req as that conflicted with the Kconfig changes
> which have landed in u-boot/master, this pull-req replaces all the boards.cfg changes
> from the previous series with defconfig changes / additions;

The conversion to Kconfig looks good.
Thanks!



Best Regards
Masahiro Yamada
Albert ARIBAUD Aug. 9, 2014, 1:41 p.m. UTC | #2 
Hi Masahiro,

On my way to applying this.

On Fri, 01 Aug 2014 10:54:28 +0900, Masahiro Yamada
<yamada.m@jp.panasonic.com> wrote:

> Hi Hans,
> 
> 
> On Thu, 31 Jul 2014 16:30:22 +0200
> Hans de Goede <hdegoede@redhat.com> wrote:
> 
> > Hi Albert
> > 
> > Note:
> > 
> > 1) This superseeds my previous pull-req as that conflicted with the Kconfig changes
> > which have landed in u-boot/master, this pull-req replaces all the boards.cfg changes
> > from the previous series with defconfig changes / additions;
> 
> The conversion to Kconfig looks good.
> Thanks!
> 
> 
> 
> Best Regards
> Masahiro Yamada

Amicalement,
Albert ARIBAUD Aug. 9, 2014, 4:42 p.m. UTC | #3 
Hi Hans,

On Thu, 31 Jul 2014 16:30:22 +0200, Hans de Goede <hdegoede@redhat.com>
wrote:

> Hi Albert
> 
> Note:
> 
> 1) This superseeds my previous pull-req as that conflicted with the Kconfig changes
> which have landed in u-boot/master, this pull-req replaces all the boards.cfg changes
> from the previous series with defconfig changes / additions;
> 
> 2) Since this new pull-req is intended to resolve conflicts with u-boot/master it
> is based on u-boot/master rather then on u-boot-arm/master.
> 
> 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 25b4adbba018633b943a99322bfb2fb819c0bafb:
> 
>   include: remove CONFIG_SPL/CONFIG_TPL definition in config headers (2014-07-30 14:42:03 -0400)
> 
> are available in the git repository at:
> 
>   http://git.denx.de/u-boot-sunxi.git master
> 
> for you to fetch changes up to 3340eab26d89176dd0bf543e6d2590665c577423:
> 
>   sun7i: Add bananapi board (2014-07-31 15:37:24 +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/MAINTAINERS                       |  19 ++-
>  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 ++++
>  configs/A10-OLinuXino-Lime_defconfig          |   4 +
>  configs/A10s-OLinuXino-M_defconfig            |   4 +
>  configs/A13-OLinuXinoM_defconfig              |   2 +-
>  configs/A13-OLinuXino_defconfig               |   4 +
>  configs/A20-OLinuXino_MICRO_defconfig         |   4 +
>  configs/Auxtek-T004_defconfig                 |   4 +
>  configs/Bananapi_defconfig                    |   4 +
>  configs/Cubieboard2_FEL_defconfig             |   2 +-
>  configs/Cubieboard2_defconfig                 |   2 +-
>  configs/Cubieboard_defconfig                  |   2 +-
>  configs/Cubietruck_FEL_defconfig              |   2 +-
>  configs/Cubietruck_defconfig                  |   2 +-
>  configs/Linksprite_pcDuino3_defconfig         |   4 +
>  configs/Mele_A1000G_defconfig                 |   4 +
>  configs/Mele_A1000_defconfig                  |   4 +
>  configs/Mini-X-1Gb_defconfig                  |   4 +
>  configs/Mini-X_defconfig                      |   4 +
>  configs/ba10_tv_box_defconfig                 |   4 +
>  configs/i12-tvbox_defconfig                   |   4 +
>  configs/qt840a_defconfig                      |   4 +
>  configs/r7-tv-dongle_defconfig                |   2 +-
>  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 +++
>  48 files changed, 982 insertions(+), 13 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 configs/A10-OLinuXino-Lime_defconfig
>  create mode 100644 configs/A10s-OLinuXino-M_defconfig
>  create mode 100644 configs/A13-OLinuXino_defconfig
>  create mode 100644 configs/A20-OLinuXino_MICRO_defconfig
>  create mode 100644 configs/Auxtek-T004_defconfig
>  create mode 100644 configs/Bananapi_defconfig
>  create mode 100644 configs/Linksprite_pcDuino3_defconfig
>  create mode 100644 configs/Mele_A1000G_defconfig
>  create mode 100644 configs/Mele_A1000_defconfig
>  create mode 100644 configs/Mini-X-1Gb_defconfig
>  create mode 100644 configs/Mini-X_defconfig
>  create mode 100644 configs/ba10_tv_box_defconfig
>  create mode 100644 configs/i12-tvbox_defconfig
>  create mode 100644 configs/qt840a_defconfig
>  create mode 100644 drivers/usb/host/ehci-sunxi.c
> 
> Regards,
> 
> Hans

Applied to u-boot-arm/master, thanks!

Amicalement,