| Message ID | 54F825C7.9030900@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Thu, Mar 05, 2015 at 10:45:43AM +0100, Stefano Babic wrote: > Hi Tom, > > please pull from u-boot-imx, thanks ! > > > The following changes since commit 1606b34aa50804227806971dbb6b82ea0bf81f55: > > Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq > (2015-02-25 18:14: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 32df39c741788e8637cffe6633d73594b26d70fb: > > mx5: fix get_reset_cause (2015-03-05 10:29:27 +0100) > Applied to u-boot/master, thanks!
Hi Tom, please pull from u-boot-imx, thanks ! The following changes since commit 1606b34aa50804227806971dbb6b82ea0bf81f55: Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq (2015-02-25 18:14: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 32df39c741788e8637cffe6633d73594b26d70fb: mx5: fix get_reset_cause (2015-03-05 10:29:27 +0100) ---------------------------------------------------------------- Christian Gmeiner (2): cmd_eeprom: make it possible to define the used i2c bus ot1200: add eeprom command to non-SPL build Eric Nelson (2): ARM: i.MX: provide access to reset cause through get_imx_reset_cause() nitrogen6x: set environment variable reset_cause Fabio Estevam (9): mc34704: Add the definition of ONOFFA bit mx25pdk: Turn on the LCD supply mx31: Fix boot hang by avoiding vector relocation mx35: Fix boot hang by avoiding vector relocation mx6sabre: Enable User Mass Storage mx6sabre: Select CMD_EXT4 options mx6slevk: Provide a proper pad configuration for OTG1_ID pin warp: Add USB Mass Storage support warp: Select BOUNCE_BUFFER and CMD_EXT options Otavio Salvador (4): mmc: fsl_esdhc: Add CMD11 support to switch to 1.8V mmc: fsl_esdhc: Add support to force VSELECT set imx: mx6sl: Extend USDHC SD2 pins to support 8-wire use warp: Add initial WaRP Board support Peng Fan (7): pmic:pfuze implement pmic_mode_init imx:mx6 set normal APS and standby PFM mode ARM: imx6: disable bandgap self-bias after boot ARM: imx6 Add WDOG3 for i.MX6SX imx:mx6sl add I2c pad settings imx:mx6slevk add pmic and i2c configuration imx:mx6slevk implement power init board Raul Cardenas (1): imx6: Added DEK blob generator command Soeren Moch (2): board: tbs2910: Gate clock when switching async clock muxes board: tbs2910: Enable USB Mass Storage support Stefano Babic (4): pmic: fix missing SWITCH_SIZE Merge branch 'master' of git://git.denx.de/u-boot Merge branch 'master' of git://git.denx.de/u-boot mx5: fix get_reset_cause README | 3 ++ arch/arm/Kconfig | 5 ++ arch/arm/cpu/arm1136/mx31/Makefile | 4 ++ arch/arm/cpu/arm1136/mx31/relocate.S | 23 ++++++++ arch/arm/cpu/arm1136/mx35/Makefile | 4 ++ arch/arm/cpu/arm1136/mx35/relocate.S | 23 ++++++++ arch/arm/cpu/armv7/mx6/soc.c | 29 ++++++++++ arch/arm/imx-common/Makefile | 1 + arch/arm/imx-common/cmd_dek.c | 91 +++++++++++++++++++++++++++++++ arch/arm/imx-common/cpu.c | 10 +++- arch/arm/imx-common/timer.c | 17 ++++++ arch/arm/include/asm/arch-imx/cpu.h | 2 + arch/arm/include/asm/arch-mx5/sys_proto.h | 1 - arch/arm/include/asm/arch-mx6/crm_regs.h | 2 + arch/arm/include/asm/arch-mx6/imx-regs.h | 4 ++ arch/arm/include/asm/arch-mx6/mx6sl_pins.h | 10 ++++ board/boundary/nitrogen6x/nitrogen6x.c | 1 + board/freescale/common/pfuze.c | 38 +++++++++++++ board/freescale/common/pfuze.h | 1 + board/freescale/mx25pdk/mx25pdk.c | 4 +- board/freescale/mx53loco/mx53loco.c | 16 ------ board/freescale/mx6qsabreauto/mx6qsabreauto.c | 6 +++ board/freescale/mx6sabresd/mx6sabresd.c | 6 ++- board/freescale/mx6slevk/mx6slevk.c | 49 ++++++++++++++++- board/freescale/mx6sxsabresd/mx6sxsabresd.c | 6 ++- board/tbs/tbs2910/tbs2910.c | 28 +++++----- board/warp/Kconfig | 12 +++++ board/warp/MAINTAINERS | 6 +++ board/warp/Makefile | 8 +++ board/warp/warp.c | 119 +++++++++++++++++++++++++++++++++++++++++ common/cmd_eeprom.c | 6 +++ configs/warp_defconfig | 3 ++ doc/README.fsl-esdhc | 1 + doc/README.mxc_hab | 48 +++++++++++++++++ drivers/crypto/fsl/Makefile | 2 +- drivers/crypto/fsl/desc.h | 15 ++++++ drivers/crypto/fsl/fsl_blob.c | 52 ++++++++++++++++++ drivers/crypto/fsl/jobdesc.c | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++- drivers/crypto/fsl/jobdesc.h | 14 +++++ drivers/crypto/fsl/jr.c | 31 +++++++++-- drivers/mmc/fsl_esdhc.c | 33 +++++++++--- include/configs/mx53loco.h | 2 + include/configs/mx6sabre_common.h | 16 ++++++ include/configs/mx6slevk.h | 12 +++++ include/configs/ot1200.h | 10 ++++ include/configs/tbs2910.h | 13 +++++ include/configs/warp.h | 228 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/fsl_esdhc.h | 2 + include/fsl_sec.h | 78 +++++++++++++++++++++++++-- include/mc34704.h | 1 + include/mmc.h | 1 + include/power/pfuze100_pmic.h | 2 + 52 files changed, 1196 insertions(+), 52 deletions(-) create mode 100644 arch/arm/cpu/arm1136/mx31/relocate.S create mode 100644 arch/arm/cpu/arm1136/mx35/relocate.S create mode 100644 arch/arm/imx-common/cmd_dek.c create mode 100644 board/warp/Kconfig create mode 100644 board/warp/MAINTAINERS create mode 100644 board/warp/Makefile create mode 100644 board/warp/warp.c create mode 100644 configs/warp_defconfig create mode 100644 include/configs/warp.h