mbox

[U-Boot] Please pull u-boot-sunxi master

Message ID 5569804C.4000503@redhat.com
State Accepted
Headers show

Pull-request

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

Message

Hans de Goede May 30, 2015, 9:18 a.m. UTC
Hi Tom,

Please pull u-boot-sunxi/master into master for a number of
patch-sets which have been in the making for a long time and
are now ready for merging.

Highlights:
- A80 (suni9i) SoC support (u-boot.bin only, no SPL support yet)
- SPL nand support (support loading u-boot.bin from nand)
- PSCI support for sun6i, sun8i-a23 and sun8i-a33 SoCs

The following changes since commit 012681b1fa822492bb8fdc5c2dd3d24d6092e110:

   am33xx, spl, siemens: enable debug uart output again (2015-05-28 08:18:25 -0400)

are available in the git repository at:

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

for you to fetch changes up to 014414f53695ab3ba5a9d344ad1ba8952bce157c:

   ARM: sunxi: Enable PSCI for sun8i (2015-05-29 13:46:36 +0200)

----------------------------------------------------------------
Chen-Yu Tsai (6):
       ARM: sunxi: Document registers in PSCI code
       ARM: sunxi: Make PSCI code sun7i specific
       ARM: sunxi: Add sun6i specific PSCI implementation
       ARM: sunxi: Enable PSCI for sun6i
       ARM: sunxi: Share sun6i PSCI backend with sun8i
       ARM: sunxi: Enable PSCI for sun8i

Daniel KochmaƄski (2):
       sunxi/nand: change BLOCK_SIZE in mksunxiboot to match NAND block size
       sunxi/nand: Add support to the SPL for loading u-boot from internal NAND memory

Hans de Goede (6):
       sunxi: Use axp221 sid on a33
       sunxi: Remove support for building "old-fashioned" fel binaries
       sunxi: Update sunxi-common.h to deal with different DRAM base addr on sun9i
       sunxi: Update sunxi-common.h to deal with different A1-SRAM base addr on sun9i
       sun9i: Basic sun9i (A80) support
       sun9i: Add Merrii_A80_Optimus board / defconfig file

Roy Spliet (2):
       sunxi: Add DMA definitions
       sunxi: Match sun4i, sun6i, sun9i CCI definitions for NAND and DMA

  arch/arm/cpu/armv7/sunxi/Makefile                 |   6 +-
  arch/arm/cpu/armv7/sunxi/board.c                  |  18 +-
  arch/arm/cpu/armv7/sunxi/cpu_info.c               |  11 +-
  arch/arm/cpu/armv7/sunxi/psci_sun6i.S             | 280 ++++++++++++++++++++++
  arch/arm/cpu/armv7/sunxi/{psci.S => psci_sun7i.S} |  14 +-
  arch/arm/include/asm/arch-sunxi/clock_sun4i.h     |   4 +-
  arch/arm/include/asm/arch-sunxi/clock_sun6i.h     |   3 +
  arch/arm/include/asm/arch-sunxi/clock_sun9i.h     |   6 +-
  arch/arm/include/asm/arch-sunxi/dma.h             |  16 ++
  arch/arm/include/asm/arch-sunxi/dma_sun4i.h       |  68 ++++++
  arch/arm/include/asm/arch-sunxi/gpio.h            |   3 +
  arch/arm/include/asm/arch-sunxi/nand.h            |  67 ++++++
  board/sunxi/Kconfig                               |  43 ++--
  board/sunxi/MAINTAINERS                           |   2 +
  board/sunxi/board.c                               |  21 +-
  configs/Merrii_A80_Optimus_defconfig              |  11 +
  drivers/mtd/nand/Makefile                         |   1 +
  drivers/mtd/nand/sunxi_nand_spl.c                 | 273 +++++++++++++++++++++
  include/configs/sun4i.h                           |   1 +
  include/configs/sun5i.h                           |   3 +
  include/configs/sun6i.h                           |   7 +
  include/configs/sun7i.h                           |   2 +
  include/configs/sun8i.h                           |  12 +
  include/configs/sun9i.h                           |  21 ++
  include/configs/sunxi-common.h                    |  94 +++++---
  tools/mksunxiboot.c                               |   8 +-
  26 files changed, 928 insertions(+), 67 deletions(-)
  create mode 100644 arch/arm/cpu/armv7/sunxi/psci_sun6i.S
  rename arch/arm/cpu/armv7/sunxi/{psci.S => psci_sun7i.S} (94%)
  create mode 100644 arch/arm/include/asm/arch-sunxi/dma.h
  create mode 100644 arch/arm/include/asm/arch-sunxi/dma_sun4i.h
  create mode 100644 arch/arm/include/asm/arch-sunxi/nand.h
  create mode 100644 configs/Merrii_A80_Optimus_defconfig
  create mode 100644 drivers/mtd/nand/sunxi_nand_spl.c
  create mode 100644 include/configs/sun9i.h

Regards,

Hans

Comments

Tom Rini June 2, 2015, 12:54 p.m. UTC | #1
On Sat, May 30, 2015 at 11:18:04AM +0200, Hans de Goede wrote:

> Hi Tom,
> 
> Please pull u-boot-sunxi/master into master for a number of
> patch-sets which have been in the making for a long time and
> are now ready for merging.
> 
> Highlights:
> - A80 (suni9i) SoC support (u-boot.bin only, no SPL support yet)
> - SPL nand support (support loading u-boot.bin from nand)
> - PSCI support for sun6i, sun8i-a23 and sun8i-a33 SoCs
> 
> The following changes since commit 012681b1fa822492bb8fdc5c2dd3d24d6092e110:
> 
>   am33xx, spl, siemens: enable debug uart output again (2015-05-28 08:18:25 -0400)
> 
> are available in the git repository at:
> 
>   http://git.denx.de/u-boot-sunxi.git master
> 
> for you to fetch changes up to 014414f53695ab3ba5a9d344ad1ba8952bce157c:
> 
>   ARM: sunxi: Enable PSCI for sun8i (2015-05-29 13:46:36 +0200)
> 

Applied to u-boot/master, thanks!