mbox

[U-Boot,PULL] u-boot-socfpga/master

Message ID 570AA713.9070102@denx.de
State Accepted
Delegated to: Tom Rini
Headers show

Pull-request

git://git.denx.de/u-boot-socfpga.git master

Message

Marek Vasut April 10, 2016, 7:18 p.m. UTC
The following changes since commit 43d3fb5c0609a76409e7859a2a5800670c7b5bd2:

  Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
(2016-04-06 14:17:22 -0400)

are available in the git repository at:

  git://git.denx.de/u-boot-socfpga.git master

for you to fetch changes up to f6060ce4bb0673bed8331441e985620b1b24adbd:

  arm: socfpga: Drop space after 'loadaddr=' in extra env (2016-04-10
17:19:49 +0200)

----------------------------------------------------------------
Denis Bakhvalov (1):
      arm: socfpga: migration of CONFIG_SPI_FLASH_BAR

Marek Vasut (4):
      arm: socfpga: Handle phy-mode OF property for GMACs
      arm: socfpga: sockit: Use more relaxed DRAM timings
      arm: socfpga: Nuke useless include
      arm: socfpga: Drop space after 'loadaddr=' in extra env

 arch/arm/mach-socfpga/include/mach/dwmmc.h |  12 ----------
 arch/arm/mach-socfpga/misc.c               |  40
+++++++++++++++++++++++++++++----
 board/terasic/sockit/qts/iocsr_config.h    | 116
+++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------
 board/terasic/sockit/qts/pll_config.h      |  14 ++++++------
 board/terasic/sockit/qts/sdram_config.h    |  30 ++++++++++++-------------
 configs/socfpga_arria5_defconfig           |   1 +
 configs/socfpga_cyclone5_defconfig         |   1 +
 configs/socfpga_de0_nano_soc_defconfig     |   1 +
 configs/socfpga_mcvevk_defconfig           |   1 +
 configs/socfpga_sockit_defconfig           |   1 +
 configs/socfpga_socrates_defconfig         |   1 +
 configs/socfpga_sr1500_defconfig           |   1 +
 drivers/mmc/socfpga_dw_mmc.c               |   1 -
 include/configs/socfpga_arria5_socdk.h     |   2 +-
 include/configs/socfpga_common.h           |   2 --
 include/configs/socfpga_cyclone5_socdk.h   |   2 +-
 include/configs/socfpga_de0_nano_soc.h     |   2 +-
 include/configs/socfpga_sockit.h           |   2 +-
 include/configs/socfpga_socrates.h         |   2 +-
 include/configs/socfpga_sr1500.h           |   2 +-
 20 files changed, 129 insertions(+), 105 deletions(-)
 delete mode 100644 arch/arm/mach-socfpga/include/mach/dwmmc.h

Comments

Tom Rini April 11, 2016, 3:02 p.m. UTC | #1
On Sun, Apr 10, 2016 at 09:18:43PM +0200, Marek Vasut wrote:

> The following changes since commit 43d3fb5c0609a76409e7859a2a5800670c7b5bd2:
> 
>   Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
> (2016-04-06 14:17:22 -0400)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-socfpga.git master
> 
> for you to fetch changes up to f6060ce4bb0673bed8331441e985620b1b24adbd:
> 
>   arm: socfpga: Drop space after 'loadaddr=' in extra env (2016-04-10
> 17:19:49 +0200)
> 

Applied to u-boot/master, thanks!