From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Babic Date: Tue, 26 May 2015 16:18:13 +0200 Subject: [U-Boot] [PULL] Please pull u-boot-imx Message-ID: <556480A5.3030402@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Tom, please pull from u-boot-imx, thanks ! The following changes since commit af1db4a39034ae15a91f0dae7da9548f0501febf: imx: ventana: use stack relocation (2015-05-15 19:25:07 +0200) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to 1022b85cb0e143b4f3a8e6c7d9258d516920d464: mx6: standardise CONFIG_CMD_CACHE (2015-05-26 15:58:57 +0200) ---------------------------------------------------------------- Axel Lin (2): pwm: imx: Prevent NULL pointer dereference pwm: imx: Remove unreachable code Fabio Estevam (2): hummingboard: Remove unused directory wandboard: Switch to SPL support Heiko Schocher (3): arm, imx6, i2c: add I2C4 for MX6DL i2c, mxc: rework i2c base address names for different SoCs arm, imx6: add support for aristainetos2 board Nikolay Dimitrov (3): imx: riotboard, marsboard: Enable thermal support imx: riotboard: Enable thermal DM support imx: marsboard: Enable thermal DM support Peng Fan (3): imx: mx6sx enable SION for i2c pin mux pmic: pfuze100 fix typo imx: dma: correct MXS_DMA_ALIGNMENT Peter Robinson (10): novena: standardise mx6_common.h include imx6: move all standard includes to mx6_common.h imx6: move generic imx6 options to mx6_common.h imx6: move standard ATAG configs to mx6_common.h imx6: move MXC_GPIO define to mx6_common.h imx6: centralise common boot options in mx6_common.h imx6: move generic miscellaneous and overwrite options imx6: standardise filesystem and boot options imx6: generic MMC config options to mx6_common mx6: standardise CONFIG_CMD_CACHE Prabhakar Kushwaha (1): arm/imx-common: Fix warning 'get_reset_cause' defined but not used Tim Harvey (17): env_nand: use nand_spl_load_image for readenv if SPL imx: ventana: config: use MMC SPL RAW support imx: ventana: (cosmetic) clean up size defines for improved readability imx: ventana: add pmic_setup to SPL arm: mx6: ddr: set fast-exit on DDR3 if pd_fast_exit specified mx6: add OTP bank1 registers imx: mx6: add get_cpu_speed_grade_hz func to return MHz speed grade from OTP imx: mx6: display max cpu frequency in print_cpuinfo() imx: mx6: add get_cpu_temp_grade to obtain cpu temperature grade from OTP imx: mx6: add display of CPU temperature grade in print_cpuinfo() thermal: imx_thermal: use CPU temperature grade for trip points imx: ventana: config: enable Falcon mode thermal: imx_thermal: increase critical temperature threshold imx: ventana: update MMC env configuration imx: ventana: update README for micro-SD boot medium imx: ventana: update README with Falcon mode documentation spl: spl_mmc: fix mmc Falcon mode regression arch/arm/Kconfig | 5 + arch/arm/cpu/armv7/mx6/clock.c | 33 +++-- arch/arm/cpu/armv7/mx6/ddr.c | 3 +- arch/arm/cpu/armv7/mx6/soc.c | 79 ++++++++++++ arch/arm/imx-common/cpu.c | 43 ++++++- arch/arm/imx-common/i2c-mxv7.c | 5 +- arch/arm/include/asm/arch-imx/imx-regs.h | 2 +- arch/arm/include/asm/arch-mx25/imx-regs.h | 6 +- arch/arm/include/asm/arch-mx27/imx-regs.h | 4 +- arch/arm/include/asm/arch-mx6/crm_regs.h | 2 + arch/arm/include/asm/arch-mx6/imx-regs.h | 20 +++ arch/arm/include/asm/arch-mx6/mx6sx_pins.h | 40 +++--- arch/arm/include/asm/arch-mx6/sys_proto.h | 2 + arch/arm/include/asm/arch-vf610/imx-regs.h | 2 +- arch/arm/include/asm/imx-common/dma.h | 2 +- board/aristainetos/Kconfig | 13 ++ board/aristainetos/MAINTAINERS | 2 + board/aristainetos/aristainetos-v1.c | 279 +++++++++++++++++++++++++++++++++++++++++ board/aristainetos/aristainetos-v2.c | 627 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/aristainetos/aristainetos.c | 323 ++++++++++------------------------------------- board/aristainetos/aristainetos2.cfg | 34 +++++ board/aristainetos/axi.cfg | 22 ++++ board/aristainetos/clocks2.cfg | 24 ++++ board/aristainetos/ddr-setup2.cfg | 59 +++++++++ board/aristainetos/nt5cc256m16cp.cfg | 60 +++++++++ board/freescale/common/pfuze.c | 4 +- board/gateworks/gw_ventana/README | 243 ++++++++++++++++++++++++++++++++++- board/gateworks/gw_ventana/gw_ventana_spl.c | 23 ++++ board/solidrun/mx6-microsom/800mhz_2x128mx16.cfg | 74 ----------- board/solidrun/mx6-microsom/clocks.cfg | 33 ----- board/solidrun/mx6-microsom/ddr-800mhz-32bit-setup.cfg | 76 ----------- board/wandboard/MAINTAINERS | 4 +- board/wandboard/Makefile | 2 +- board/wandboard/README | 22 ++-- board/wandboard/spl.c | 317 ++++++++++++++++++++++++++++++++++++++++++++++ common/env_nand.c | 7 ++ common/spl/spl_mmc.c | 2 +- configs/aristainetos2_defconfig | 3 + configs/marsboard_defconfig | 2 + configs/riotboard_defconfig | 2 + configs/wandboard_defconfig | 6 + configs/wandboard_dl_defconfig | 3 - configs/wandboard_quad_defconfig | 3 - configs/wandboard_solo_defconfig | 3 - drivers/i2c/mxc_i2c.c | 46 +++---- drivers/pwm/pwm-imx-util.c | 4 - drivers/pwm/pwm-imx.c | 12 ++ drivers/thermal/imx_thermal.c | 36 ++++-- include/configs/aristainetos-common.h | 276 ++++++++++++++++++++++++++++++++++++++++ include/configs/aristainetos.h | 314 +--------------------------------------------- include/configs/aristainetos2.h | 56 +++++++++ include/configs/cgtqmx6eval.h | 60 +-------- include/configs/cm_fx6.h | 36 ------ include/configs/embestmx6boards.h | 53 +------- include/configs/gw_ventana.h | 96 +++++--------- include/configs/mx6_common.h | 74 +++++++++++ include/configs/mx6cuboxi.h | 44 ------- include/configs/mx6qarm2.h | 57 +-------- include/configs/mx6sabre_common.h | 65 +--------- include/configs/mx6sabresd.h | 3 - include/configs/mx6slevk.h | 60 +-------- include/configs/mx6sxsabresd.h | 59 --------- include/configs/nitrogen6x.h | 69 +--------- include/configs/novena.h | 47 +------ include/configs/ot1200.h | 68 +--------- include/configs/platinum.h | 59 --------- include/configs/platinum_picon.h | 2 - include/configs/platinum_titanium.h | 2 - include/configs/secomx6quq7.h | 59 +-------- include/configs/tbs2910.h | 49 +------- include/configs/titanium.h | 58 --------- include/configs/tqma6.h | 62 --------- include/configs/udoo.h | 61 +-------- include/configs/wandboard.h | 86 +++---------- include/configs/warp.h | 57 --------- include/imx_thermal.h | 6 + include/power/pfuze100_pmic.h | 2 +- 78 files changed, 2635 insertions(+), 2099 deletions(-) create mode 100644 board/aristainetos/aristainetos-v1.c create mode 100644 board/aristainetos/aristainetos-v2.c create mode 100644 board/aristainetos/aristainetos2.cfg create mode 100644 board/aristainetos/axi.cfg create mode 100644 board/aristainetos/clocks2.cfg create mode 100644 board/aristainetos/ddr-setup2.cfg create mode 100644 board/aristainetos/nt5cc256m16cp.cfg delete mode 100644 board/solidrun/mx6-microsom/800mhz_2x128mx16.cfg delete mode 100644 board/solidrun/mx6-microsom/clocks.cfg delete mode 100644 board/solidrun/mx6-microsom/ddr-800mhz-32bit-setup.cfg create mode 100644 board/wandboard/spl.c create mode 100644 configs/aristainetos2_defconfig create mode 100644 configs/wandboard_defconfig delete mode 100644 configs/wandboard_dl_defconfig delete mode 100644 configs/wandboard_quad_defconfig delete mode 100644 configs/wandboard_solo_defconfig create mode 100644 include/configs/aristainetos-common.h create mode 100644 include/configs/aristainetos2.h -- ===================================================================== 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 =====================================================================