mbox

[U-Boot,PULL] Please pull u-boot-imx

Message ID 547313F0.3000802@denx.de
State Accepted
Delegated to: Tom Rini
Headers show

Pull-request

git://www.denx.de/git/u-boot-imx.git master

Message

Stefano Babic Nov. 24, 2014, 11:18 a.m. UTC 
Hi Tom,

please pull from u-boot-imx, thanks !

The following changes since commit f196044dfd64745a163773c6c746f9e149ace127:

  ARM: atmel: add sama5d4 xplained ultra board support (2014-11-17
08:47:18 -0500)

are available in the git repository at:

  git://www.denx.de/git/u-boot-imx.git master

for you to fetch changes up to e7eb277dced570f177d75d56f40219d9dc599ed1:

  mx6boards: Fix error handling in board_mmc_init() (2014-11-24 12:10:18
+0100)

----------------------------------------------------------------
Albert ARIBAUD (3):
      cosmetic: arm: fix whitespace in arch/arm/lib/relocate.S
      imx: fix exception vectors relocation in imx27
      tools/msximage.c: fix warning about nptr possibly uninitialized

Alexey Ignatov (1):
      ARM: mxs: tools: Add support for boot progress display flag

Fabio Estevam (23):
      mx6sabresd: Move the DCD settings to spl code
      gw_ventana: Move the DCD settings to spl code
      novena: Move the DCD settings to spl code
      mx6: Use a common SPL configuration file
      imx: consolidate set_chipselect_size function
      mx6: add weim registers
      mx6qsabreauto: Add parallel NOR flash support
      wandboard: Fix error handling in board_mmc_init()
      mx53loco: Fix error handling in board_mmc_init()
      mx6sabresd: State that only mx6q is supported in SPL
      mx6slevk: Simplify the return value of setup_fec()
      mx6sxsabresd: Simplify the return value of setup_fec()
      mx6sabresd: Add mx6sabresd_spl_defconfig to MAINTAINERS entry
      mx6sabresd: Access SRC_SBMR1 register via structure
      mx51evk: Fix error handling in board_mmc_init()
      mx6qarm2: Fix error handling in board_mmc_init()
      mx53smd: Fix error handling in board_mmc_init()
      mx53evk: Fix error handling in board_mmc_init()
      mx53ard: Fix error handling in board_mmc_init()
      gw_ventana: Use the generic spl_sd.cfg
      ot1200: Fix error handling in board_mmc_init()
      nitrogen6x: Fix error handling in board_mmc_init()
      mx6boards: Fix error handling in board_mmc_init()

Markus Niebel (4):
      tqma6: (cosmetic) remove CONFIG_FLASH_SECTOR_SIZE
      tqma6: add missing include
      tqma6: add warning on failed setup_i2c
      tqma6: use imx_ddr_size

Nikita Kiryanov (5):
      arm: mx6: introduce disable_sata_clock
      sata: implement reset_sata for dwc_ahsata
      cmd_sata: implement sata stop command
      arm: mx6: cm_fx6: implement board specific sata stop
      arm: imx: stop sata on boot

Nitin Garg (1):
      mx6: clock: Add thermal clock enable function

Peng Fan (1):
      imx:mx6sxsabresd fix pfuz probe failed

Soeren Moch (1):
      tbs2910: Fix error handling in board_mmc_init()

Ye.Li (11):
      imx: mx6slevk: Change default mmcdev to USDHC2 device
      mmc: fsl_esdhc: Update esdhc driver for iMX6SX
      imx: mx6sxsabresd: Add board support for USDHC2 and USDHC3
      power: pfuze100: Update definitions for buck regulators
      imx: mx6sabre common: Factorize the Pfuze init function
      imx: mx6sabresd: Use the pfuze common init function
      imx: mx6sxsabresd: Use the pfuze common init function
      imx: imx6q/dlsabreauto: Add PMIC Pfuze100 support
      DM: thermal: Add imx thermal DM driver
      mx6: thermal: Check cpu temperature via thermal sensor
      mx6: mx6sabre common: Enable i.MX thermal DM driver

 arch/arm/cpu/arm926ejs/mx27/Makefile    |   4 +
 arch/arm/cpu/arm926ejs/mx27/relocate.S  |  51 ++++
 .../arm926ejs/mxs/mxsimage-signed.cfg   |   1 +
 .../cpu/arm926ejs/mxs/mxsimage.mx23.cfg |   1 +
 .../cpu/arm926ejs/mxs/mxsimage.mx28.cfg |   1 +
 arch/arm/cpu/armv7/mx5/soc.c            |  31 ---
 arch/arm/cpu/armv7/mx6/clock.c          |  38 +++
 arch/arm/cpu/armv7/mx6/soc.c            |  15 ++
 arch/arm/cpu/armv7/omap-common/sata.c   |   5 +
 arch/arm/imx-common/cpu.c               |  60 ++++-
 .../arm/imx-common/spl_sd.cfg           |   2 +-
 arch/arm/include/asm/arch-imx/cpu.h     |   5 +
 .../arm/include/asm/arch-mx5/imx-regs.h |  12 +-
 arch/arm/include/asm/arch-mx6/clock.h   |   2 +
 .../arm/include/asm/arch-mx6/imx-regs.h |  37 +++
 .../include/asm/arch-mx6/sys_proto.h    |   1 +
 arch/arm/lib/crt0.S                     |   5 +
 arch/arm/lib/relocate.S                 |  73 +++---
 board/bachmann/ot1200/ot1200.c          |  10 +-
 board/boundary/nitrogen6x/nitrogen6x.c  |  10 +-
 board/compulab/cm_fx6/cm_fx6.c          |  12 +-
 board/embest/mx6boards/mx6boards.c      |  10 +-
 board/freescale/common/Makefile         |   1 +
 board/freescale/common/pfuze.c          |  54 ++++
 board/freescale/common/pfuze.h          |  12 +
 board/freescale/mx51evk/mx51evk.c       |  10 +-
 board/freescale/mx53ard/mx53ard.c       |  10 +-
 board/freescale/mx53evk/mx53evk.c       |  10 +-
 board/freescale/mx53loco/mx53loco.c     |  10 +-
 board/freescale/mx53smd/mx53smd.c       |  10 +-
 board/freescale/mx6qarm2/mx6qarm2.c     |  10 +-
 .../mx6qsabreauto/mx6qsabreauto.c       |  95 ++++++-
 board/freescale/mx6sabresd/MAINTAINERS  |   1 +
 board/freescale/mx6sabresd/mx6sabresd.c |  90 +++----
 .../mx6sabresd/mx6sabresd_spl.cfg       |  58 -----
 board/freescale/mx6slevk/mx6slevk.c     |   7 +-
 .../mx6sxsabresd/mx6sxsabresd.c         | 159 ++++++++----
 board/gateworks/gw_ventana/clocks.cfg   |  42 ----
 .../gateworks/gw_ventana/gw_ventana.cfg |  29 ---
 .../gw_ventana/gw_ventana_spl.c         |  28 +++
 board/kosagi/novena/novena_spl.c        |  28 +++
 board/kosagi/novena/setup.cfg           |  47 ----
 board/tbs/tbs2910/tbs2910.c             |  13 +-
 board/tqc/tqma6/tqma6.c                 |  13 +-
 board/tqc/tqma6/tqma6_mba6.c            |  10 +-
 board/wandboard/wandboard.c             |  10 +-
 common/cmd_sata.c                       |  24 +-
 configs/cm_fx6_defconfig                |   2 +-
 configs/gwventana_defconfig             |   2 +-
 configs/mx6sabresd_spl_defconfig        |   2 +-
 configs/novena_defconfig                |   2 +-
 doc/README.mxsimage                     |  13 +-
 drivers/Makefile                        |   1 +
 drivers/block/ata_piix.c                |   5 +
 drivers/block/dwc_ahsata.c              |  21 ++
 drivers/block/fsl_sata.c                |   5 +
 drivers/block/pata_bfin.c               |   5 +
 drivers/block/sata_dwc.c                |   5 +
 drivers/block/sata_sil.c                |   5 +
 drivers/block/sata_sil3114.c            |   5 +
 drivers/mmc/fsl_esdhc.c                 |   8 +
 drivers/thermal/Makefile                |   9 +
 drivers/thermal/imx_thermal.c           | 177 ++++++++++++++
 drivers/thermal/thermal-uclass.c        |  30 +++
 include/configs/mx6qsabreauto.h         |  16 ++
 include/configs/mx6sabre_common.h       |   7 +-
 include/configs/mx6slevk.h              |   2 +-
 include/configs/mx6sxsabresd.h          |   8 +-
 include/configs/tqma6.h                 |  28 +--
 include/dm/uclass-id.h                  |   1 +
 include/imx_thermal.h                   |  17 ++
 include/power/pfuze100_pmic.h           |  80 ++++++
 include/sata.h                          |   3 +
 include/thermal.h                       |  42 ++++
 tools/mxsimage.c                        |  20 +-
 tools/mxsimage.h                        |   5 +-
 76 files changed, 1242 insertions(+), 451 deletions(-)
 create mode 100644 arch/arm/cpu/arm926ejs/mx27/relocate.S
 rename board/compulab/cm_fx6/imximage.cfg =>
arch/arm/imx-common/spl_sd.cfg (88%)
 create mode 100644 board/freescale/common/pfuze.c
 create mode 100644 board/freescale/common/pfuze.h
 delete mode 100644 board/freescale/mx6sabresd/mx6sabresd_spl.cfg
 delete mode 100644 board/gateworks/gw_ventana/clocks.cfg
 delete mode 100644 board/gateworks/gw_ventana/gw_ventana.cfg
 delete mode 100644 board/kosagi/novena/setup.cfg
 create mode 100644 drivers/thermal/Makefile
 create mode 100644 drivers/thermal/imx_thermal.c
 create mode 100644 drivers/thermal/thermal-uclass.c
 create mode 100644 include/imx_thermal.h
 create mode 100644 include/thermal.h

Stefano

Comments

Tom Rini Nov. 24, 2014, 10:13 p.m. UTC | #1 
On Mon, Nov 24, 2014 at 12:18:08PM +0100, Stefano Babic wrote:

> Hi Tom,
> 
> please pull from u-boot-imx, thanks !
> 
> The following changes since commit f196044dfd64745a163773c6c746f9e149ace127:
> 
>   ARM: atmel: add sama5d4 xplained ultra board support (2014-11-17
> 08:47:18 -0500)
> 
> are available in the git repository at:
> 
>   git://www.denx.de/git/u-boot-imx.git master
> 
> for you to fetch changes up to e7eb277dced570f177d75d56f40219d9dc599ed1:
> 
>   mx6boards: Fix error handling in board_mmc_init() (2014-11-24 12:10:18
> +0100)
> 

Applied to u-boot/master, thanks!