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

Hans de Goede hdegoede at redhat.com
Thu Nov 13 16:04:25 CET 2014


Hi Tom,

Please pull u-boot-sunxi/master into master, highlights:

1) sun6i dram init / SPL support, allowing full-boot of sun6i SoCs with just u-boot + linux
2) sun6i ehci support
3) A bugfix for the gmac on the bananapi

The following changes since commit 63f7af9a4cfb4a3b9136674c6612c6d13957c2cd:

  Merge branch 'master' of git://git.denx.de/u-boot-uniphier (2014-11-11 15:49:10 -0500)

are available in the git repository at:

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

for you to fetch changes up to 64a97599b79e277600bc6f1b22cf48aa04ee9bd0:

  sunxi: gmac: Update bananapi fixup to the new CONFIG_TARGET_<BOARD> structure (2014-11-13 14:49:02 +0100)

----------------------------------------------------------------
Hans de Goede (9):
      sun6i: Add clock functions needed for SPL / DRAM init
      sun6i: Add cpucfg register definitions
      sun4i: Rename dram files to dram_sun4i.x
      sun6i: Add dram initialization code
      sun6i: Poke magic sram controller register to avoid cache issues
      sun6i: Enable SPL
      sun6i: Add Mele M9 board
      sunxi: ehci: Add proper Kconfig options to select the usb Vbus gpio-s
      sun6i: ehci: Add sun6i ehci support

Oliver Schinagl (2):
      sun6i: Add new p2wi controller driver
      sun6i: Add basic axp221 driver

Zoltan HERPAI (1):
      sunxi: gmac: Update bananapi fixup to the new CONFIG_TARGET_<BOARD> structure

 arch/arm/cpu/armv7/sunxi/Makefile                 |   8 +-
 arch/arm/cpu/armv7/sunxi/board.c                  |   5 +
 arch/arm/cpu/armv7/sunxi/clock_sun6i.c            |  77 ++++
 arch/arm/cpu/armv7/sunxi/{dram.c => dram_sun4i.c} |   0
 arch/arm/cpu/armv7/sunxi/dram_sun6i.c             | 435 ++++++++++++++++++++++
 arch/arm/cpu/armv7/sunxi/p2wi.c                   | 117 ++++++
 arch/arm/cpu/armv7/sunxi/psci.S                   |   4 +-
 arch/arm/include/asm/arch-sunxi/clock.h           |   1 +
 arch/arm/include/asm/arch-sunxi/clock_sun4i.h     |   3 +
 arch/arm/include/asm/arch-sunxi/clock_sun6i.h     |  38 +-
 arch/arm/include/asm/arch-sunxi/cpu.h             |  19 +-
 arch/arm/include/asm/arch-sunxi/cpucfg_sun6i.h    |  67 ++++
 arch/arm/include/asm/arch-sunxi/dram.h            | 171 +--------
 arch/arm/include/asm/arch-sunxi/dram_sun4i.h      | 182 +++++++++
 arch/arm/include/asm/arch-sunxi/dram_sun6i.h      | 359 ++++++++++++++++++
 arch/arm/include/asm/arch-sunxi/gpio.h            |   3 +
 arch/arm/include/asm/arch-sunxi/p2wi.h            | 140 +++++++
 arch/arm/include/asm/arch-sunxi/prcm.h            |   1 +
 board/sunxi/Kconfig                               |  21 ++
 board/sunxi/MAINTAINERS                           |   1 +
 board/sunxi/board.c                               |  26 ++
 board/sunxi/gmac.c                                |   2 +-
 configs/A10s-OLinuXino-M_defconfig                |   3 +-
 configs/A13-OLinuXinoM_defconfig                  |   3 +-
 configs/A13-OLinuXino_defconfig                   |   3 +-
 configs/Auxtek-T004_defconfig                     |   3 +-
 configs/Colombus_defconfig                        |   9 +-
 configs/Mele_M9_defconfig                         |  18 +
 configs/ba10_tv_box_defconfig                     |   3 +-
 configs/r7-tv-dongle_defconfig                    |   3 +-
 drivers/power/Kconfig                             |  47 +++
 drivers/power/Makefile                            |   1 +
 drivers/power/axp221.c                            | 186 +++++++++
 drivers/usb/host/ehci-sunxi.c                     |  80 ++--
 include/axp221.h                                  |  50 +++
 include/configs/sun4i.h                           |   7 -
 include/configs/sun6i.h                           |   6 +
 include/configs/sun7i.h                           |   7 -
 38 files changed, 1883 insertions(+), 226 deletions(-)
 rename arch/arm/cpu/armv7/sunxi/{dram.c => dram_sun4i.c} (100%)
 create mode 100644 arch/arm/cpu/armv7/sunxi/dram_sun6i.c
 create mode 100644 arch/arm/cpu/armv7/sunxi/p2wi.c
 create mode 100644 arch/arm/include/asm/arch-sunxi/cpucfg_sun6i.h
 create mode 100644 arch/arm/include/asm/arch-sunxi/dram_sun4i.h
 create mode 100644 arch/arm/include/asm/arch-sunxi/dram_sun6i.h
 create mode 100644 arch/arm/include/asm/arch-sunxi/p2wi.h
 create mode 100644 configs/Mele_M9_defconfig
 create mode 100644 drivers/power/axp221.c
 create mode 100644 include/axp221.h

Regards,

Hans


More information about the U-Boot mailing list