mbox

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

Message ID 2cefa54f-118e-e3af-7625-7e1a686d58d2@redhat.com
State Accepted
Delegated to: Tom Rini
Headers show

Pull-request

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

Message

Hans de Goede Oct. 30, 2016, 11:52 a.m. UTC 
Hi Tom,

Here is a pull request with some small sunxi cleanups / fixes
for v2016.11.

Note I expect you to merge this after Marek's usb pull-req. If you don't
nothing will break, but you will get a whole bunch of new compiler warnings
when building the pine64_plus defconfig.

The following changes since commit 4d6afd69babafbf6580cb04dacd9479df03a5de0:

   configs/chromebox_panther_defconfig: Re-enable CONFIG_DM_PCI (2016-10-29 09:00:01 -0400)

are available in the git repository at:

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

for you to fetch changes up to fed329aebe3aaac0928c73547ac6316af2adf0cd:

   tools: add mksunxiboot to tools-all target (2016-10-30 11:38:04 +0100)

----------------------------------------------------------------
Amit Singh Tomar (1):
       sunxi: A64: enable USB support

Andre Przywara (1):
       sunxi: dts: Pine64: add Ethernet alias

Jagan Teki (1):
       sunxi: Rename CONFIG_SUNXI to CONFIG_ARCH_SUNXI

Masahiro Yamada (1):
       sunxi: remove unneeded CONFIG_USB_MAX_CONTROLLER_COUNT defines

Stefan Brüns (1):
       tools: add mksunxiboot to tools-all target

Stefan Mavrodiev (1):
       sunxi: Update DRAM clock for Olimex A20 boards

  Makefile                                    |  2 +-
  arch/arm/cpu/armv7/Makefile                 |  2 +-
  arch/arm/dts/sun50i-a64-pine64-common.dtsi  | 13 +++++++++++++
  arch/arm/dts/sun50i-a64.dtsi                | 29 +++++++++++++++++++++++++++++
  arch/arm/include/asm/arch-sunxi/cpu_sun4i.h |  2 +-
  arch/arm/mach-sunxi/usb_phy.c               |  5 +++--
  configs/A20-Olimex-SOM-EVB_defconfig        |  2 +-
  configs/pine64_plus_defconfig               |  1 +
  drivers/i2c/mvtwsi.c                        |  6 +++---
  drivers/usb/host/ehci-sunxi.c               |  7 ++++---
  drivers/usb/host/ohci-sunxi.c               |  1 +
  include/configs/sun4i.h                     |  1 -
  include/configs/sun50i.h                    |  5 +++++
  include/configs/sun5i.h                     |  1 -
  include/configs/sun6i.h                     |  1 -
  include/configs/sun7i.h                     |  1 -
  include/configs/sun8i.h                     |  1 -
  include/configs/sunxi-common.h              |  1 -
  scripts/Makefile.spl                        |  2 +-
  scripts/config_whitelist.txt                |  1 -
  tools/Makefile                              |  3 ++-
  tools/mksunxiboot.c                         |  2 +-
  22 files changed, 67 insertions(+), 22 deletions(-)

Regards,

Hans

Comments

Tom Rini Oct. 30, 2016, 6:15 p.m. UTC | #1 
On Sun, Oct 30, 2016 at 12:52:06PM +0100, Hans de Goede wrote:

> Hi Tom,
> 
> Here is a pull request with some small sunxi cleanups / fixes
> for v2016.11.
> 
> Note I expect you to merge this after Marek's usb pull-req. If you don't
> nothing will break, but you will get a whole bunch of new compiler warnings
> when building the pine64_plus defconfig.
> 
> The following changes since commit 4d6afd69babafbf6580cb04dacd9479df03a5de0:
> 
>   configs/chromebox_panther_defconfig: Re-enable CONFIG_DM_PCI (2016-10-29 09:00:01 -0400)
> 
> are available in the git repository at:
> 
>   http://git.denx.de/u-boot-sunxi.git master
> 
> for you to fetch changes up to fed329aebe3aaac0928c73547ac6316af2adf0cd:
> 
>   tools: add mksunxiboot to tools-all target (2016-10-30 11:38:04 +0100)
> 

Applied to u-boot/master, thanks!