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

Stefano Babic
2015-11-16T11:26:53Z

Hi Tom,

please pull from u-boot-imx, thanks!

The following changes since commit 038be18fd95aa6283eafb85ceabc0b880976424b:

nios2: add 3c120 and 10m50 devboards MAINTAINERS (2015-11-12 08:26:59
+0800)

are available in the git repository at:

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

for you to fetch changes up to ec26c1eef735befb7011c24e08e6310ab6dc9be6:

arm: mx6: cm-fx6: add splash locations to cm-fx6 (2015-11-16 12:01:36
+0100)

----------------------------------------------------------------
Adrian Alonso (10):
imx: cpu: move common chip revision id's
imx: hab: rework secure boot support for imx6
imx: hab: use unified rom section for mx6sx and mx6ul
imx: hab: rework unified rom section for mx7
imx: hab: add secure boot fuse details
arm: imx: add secure boot fuse details for imx6 SoC
arm: imx: add secure boot fuse details for imx7 SoC
imx: hab: use read_fuse for secure boot settings
imx: hab: add mx7 secure boot support
mx7dsabresd: add secure boot support

Anthony Felice (1):
vf610twr: Fix typo in DRAM init

Damien Riegel (1):
ts4800: add CONFIG_OF_LIBFDT

Fabio Estevam (7):
mx6sabresd: Remove empty reset_cpu()
mx6slevk: Remove empty reset_cpu()
mx6sxsabresd: Remove empty reset_cpu()
mx6ul_14x14_evk: Remove empty reset_cpu()
novena: Remove empty reset_cpu()
ot1200: Remove empty reset_cpu()
gw_ventana: Remove empty reset_cpu()

Heiko Schocher (3):
arm, imx: add some gpr register defines
arm, imx6, aristainetos2: set gpr register after reset
imx35, flea3: add FIT image support

Marek Vasut (1):
arm: novena: Fix kernel_addr_r env variable

Nikita Kiryanov (5):
splash_source: rename *_read() to *_read_raw()
splash_source: add support for filesystem formatted mmc
splash_source: add support for filesystem formatted usb
splash_source: add support for filesystem formatted sata
arm: mx6: cm-fx6: add splash locations to cm-fx6

Peng Fan (22):
imx-common: timer: clean up code
driver: misc: add MXC_OCOTP Kconfig entry
imx: mx6sabresd discard PHYS_SDRAM_SIZE
imx: mx6sabresd: add i.MX6DQP Sabresd support
arm: discard relocation entries for secure text
mx7: psci: add basic psci support
imx: mx7: default enable non-secure mode
mxs: add parameter base_addr for mxs_set_lcdclk
xfi3: correct function name
mxs: regs-common.h must be wrapped with !__ASSEMBLY__
imx: include linux/types.h for regs-common.h
imx: imx-common: move lcdif structure and macro definition to
imx-common
imx: lcdif: use one register structure for i.MXes
imx: mx6: fix register address
imx: mx6: crm_reg: add LCDIF related macros
imx: mx6: add clock api for lcdif
imx: mx6ul_14x14_evk: support lcdif display
video: mxsfb: introduce lcdif_power_down
imx: mx6: implement reset_misc
imx: imx-common: power down lcdif before boot os
imx: mx7: compile misc.c for mx7
imx: mx7dsabresd: support lcdif

Stefano Babic (5):
Merge branch 'master' of git://git.denx.de/u-boot
Merge branch 'master' of git://git.denx.de/u-boot
Merge branch 'master' of git://git.denx.de/u-boot
Merge git://git.denx.de/u-boot
imx6: fix warnings due to switch to distro environment

Tzu-Jung Lee (1):
mx7dsabresd: enable DFU support

Vagrant Cascadian (2):
arm: imx: Switch Wandboard to use config_distro_bootcmd.h.
arm: imx: Switch mx6cuboxi to use config_distro_bootcmd.h.

arch/arm/cpu/arm926ejs/mx25/generic.c | 1 +
arch/arm/cpu/arm926ejs/mxs/clock.c | 2 +-
arch/arm/cpu/armv7/mx6/Kconfig | 2 +
arch/arm/cpu/armv7/mx6/Makefile | 1 -
arch/arm/cpu/armv7/mx6/clock.c | 245
+++++++++++++++++++++
arch/arm/cpu/armv7/mx6/soc.c | 15 ++
arch/arm/cpu/armv7/mx7/Kconfig | 2 +
arch/arm/cpu/armv7/mx7/Makefile | 4 +
arch/arm/cpu/armv7/mx7/psci-mx7.c | 69 ++++++
arch/arm/cpu/armv7/mx7/psci.S | 54 +++++
arch/arm/cpu/armv7/mx7/soc.c | 17 ++
arch/arm/cpu/u-boot.lds | 17 ++
arch/arm/imx-common/Kconfig | 3 +
arch/arm/imx-common/Makefile | 3 +-
arch/arm/imx-common/cpu.c | 3 +
arch/arm/{cpu/armv7/mx6 => imx-common}/hab.c | 25 ++-
arch/arm/imx-common/timer.c | 75 +------
arch/arm/include/asm/arch-imx/cpu.h | 12 +
arch/arm/include/asm/arch-mx25/imx-regs.h | 4 -
arch/arm/include/asm/arch-mx5/imx-regs.h | 11 -
arch/arm/include/asm/arch-mx6/clock.h | 2 +
arch/arm/include/asm/arch-mx6/crm_regs.h | 34 ++-
arch/arm/include/asm/arch-mx6/imx-regs.h | 57 ++++-
arch/arm/include/asm/arch-mx7/imx-regs.h | 99 +--------
arch/arm/include/asm/arch-mxs/clock.h | 2 +-
arch/arm/include/asm/arch-mxs/imx-regs.h | 2 +-
.../arm/include/asm/{arch-mx6 => imx-common}/hab.h | 11 +-
arch/arm/include/asm/imx-common/regs-common.h | 2 +
.../asm/{arch-mxs => imx-common}/regs-lcdif.h | 30 ++-
arch/arm/include/asm/imx-common/sys_proto.h | 2 +
board/aristainetos/aristainetos-v2.c | 16 ++
board/bachmann/ot1200/ot1200_spl.c | 4 -
board/compulab/cm_fx6/cm_fx6.c | 19 ++
board/compulab/cm_t35/cm_t35.c | 1 +
board/creative/xfi3/xfi3.c | 2 +-
board/freescale/mx6sabresd/mx6sabresd.c | 73 +++++-
board/freescale/mx6slevk/mx6slevk.c | 4 -
board/freescale/mx6sxsabresd/mx6sxsabresd.c | 4 -
board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 67 +++++-
board/freescale/mx7dsabresd/imximage.cfg | 7 +
board/freescale/mx7dsabresd/mx7dsabresd.c | 64 ++++++
board/gateworks/gw_ventana/gw_ventana_spl.c | 4 -
board/kosagi/novena/novena_spl.c | 4 -
common/splash_source.c | 125 ++++++++++-
doc/README.splashprepare | 5 +
drivers/misc/Kconfig | 7 +
drivers/video/mxsfb.c | 19 +-
include/configs/flea3.h | 4 +
include/configs/mx6cuboxi.h | 88 ++------
include/configs/mx6sabre_common.h | 2 +
include/configs/mx6sabresd.h | 1 -
include/configs/mx6ul_14x14_evk.h | 18 ++
include/configs/mx7_common.h | 12 +-
include/configs/mx7dsabresd.h | 48 ++++
include/configs/novena.h | 2 +-
include/configs/ts4800.h | 2 +
include/configs/wandboard.h | 82 ++-----
include/splash.h | 10 +
58 files changed, 1105 insertions(+), 395 deletions(-)
create mode 100644 arch/arm/cpu/armv7/mx7/psci-mx7.c
create mode 100644 arch/arm/cpu/armv7/mx7/psci.S
rename arch/arm/{cpu/armv7/mx6 => imx-common}/hab.c (96%)
rename arch/arm/include/asm/{arch-mx6 => imx-common}/hab.h (96%)
rename arch/arm/include/asm/{arch-mxs => imx-common}/regs-lcdif.h (92%)

--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================