From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Babic Date: Sun, 02 Aug 2015 11:23:12 +0200 Subject: [U-Boot] [PULL] Please pull u-boot-imx Message-ID: <55BDE180.4030905@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 605e15db2b54302364a2528d3c6604fbc57be846: Merge git://git.denx.de/u-boot-x86 (2015-07-15 10:41:20 -0400) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to f85764cc1f6ab01ffc60dd78de9c4de4cff2b5ce: arm: mx6: tqma6: fix build for WRU-IV baseboard (2015-08-02 11:12:41 +0200) ---------------------------------------------------------------- Adrian Alonso (1): imx: imximage: add new CHECK/CLR BIT command Albert ARIBAUD \(3ADEV\) (3): net: fec_mxc: remove useless struct nbuf i2c: fix vf610 support tools: mkimage: fix imximage header size Fabio Estevam (5): thermal: Fix comments power: pmic: Add support for MAX77696 PMIC warp: Add MAX77696 support mx6sabresd: Use 'int' for return values mx6sxsabresd: Use 'int' for return values Guillaume GARDET (1): mx53loco: Use generic 'load' command instead of 'fatload' Nikita Kiryanov (11): arm: mx6: cm-fx6: map HDMI to IPU1 DI0 explicitly arm: mx6: cm-fx6: make it possible to not init display arm: mx6: cm-fx6: add support for displaytype env var arm: mx6: cm-fx6: setup hdmi only on hdmi enable arm: mx6: cm-fx6: move CMD configs to defconfig arm: mx6: cm-fx6: move cm-fx6 target under ARCH_MX6 arm: mx6: kconfig: don't select CPU_V7 per board arm: mx6: usb: kconfig: add USB_EHCI_MX6 kconfig option usb: kconfig: usb keyboard kconfig usb: kconfig: create a menu for usb sf: kconfig: add kconfig options for spi flashes Otavio Salvador (13): cgtqmx6eval: Use default prompt cgtqmx6eval: Use the default CONFIG_SYS_PBSIZE cgtqmx6eval: Staticize when possible cgtqmx6eval: Improve the error handling cgtqmx6eval: Fit into single lines cgtqmx6eval: Add ESDHC3 support cgtqmx6eval: Add thermal support cgtqmx6eval: Add PMIC support cgtqmx6eval: Add USB support cgtqmx6eval: Add splash screen support cgtqmx6eval: Add SATA support cgtqmx6eval: Align DCD settings with Congatec's U-boot cgtqmx6eval: Use standard boot script Peng Fan (23): imx: mx6 remove duplicated enable_cspi_clock imx: mx6 add i2c4 clock support for i.MX6SX mmc:fsl_esdhc invalidate dcache before read imx: add cpu type for i.MX6QP/DP imx: mx6: ccm: Change the clock settings for i.MX6QP imx: mx6qp Enable PRG clock for IPU imx: mx6sabresd/sabreauto runtime setting fdt_file imx: mx6qpsabreauto: Add MX6QP SABREAUTO CPU3 board support imx: mx6ul: Add i.MX6UL CPU type imx: mx6ul: Add pins IOMUX head file imx: mx6ul: Update imx registers head file imx: mx6ul Add CONFIG_SYS_CACHELINE_SIZE for i.MX6UL imx-common: timer: add i.MX6UL support imx: mx6ul remove errata for i.MX6UL imx:mx6ul add clock support imx: mx6ul select SYS_L2CACHE_OFF imx: mx6ul update soc related settings imx: mx6 add PAD_CTL_SPEED_LOW for i.MX6SX/UL mxc: gpio add i.MX6UL support mx6_common: Fix LOADADDR and SYS_TEXT_BASE for i.MX6UL imx:mx6ul add dram spl configuration and header file imx: imx6_spl add mx6ul support imx: mx6ul_14x14_evk add basic board support Peter Robinson (1): imx6: standardise OCOTP and fuse config to mx6_common Stefan Roese (1): arm: mx6: tqma6: Add WRU-IV baseboard for the TQMa6 SoM Stefano Babic (3): Merge branch 'master' of git://git.denx.de/u-boot Merge branch 'master' of git://git.denx.de/u-boot arm: mx6: tqma6: fix build for WRU-IV baseboard Tim Harvey (2): thermal:imx_thermal: enter busywait cooling loop when over max CPU temp thermal: imx_thermal: fix busywait if IMX6 temp <0C Ulises Cardenas (1): iMX: adding parsing to hab_status command Ye.Li (1): imx: mx6: hab : Remove the cache issue workaroud in hab for i.MX6QP arch/arm/Kconfig | 16 +- arch/arm/cpu/armv7/mx6/Kconfig | 13 +- arch/arm/cpu/armv7/mx6/clock.c | 211 ++++++++++------- arch/arm/cpu/armv7/mx6/ddr.c | 61 ++++- arch/arm/cpu/armv7/mx6/hab.c | 176 +++++++++++++- arch/arm/cpu/armv7/mx6/soc.c | 25 +- arch/arm/imx-common/cpu.c | 6 + arch/arm/imx-common/timer.c | 8 +- arch/arm/include/asm/arch-imx/cpu.h | 5 +- arch/arm/include/asm/arch-mx6/clock.h | 1 - arch/arm/include/asm/arch-mx6/crm_regs.h | 139 ++++++----- arch/arm/include/asm/arch-mx6/hab.h | 85 ++++++- arch/arm/include/asm/arch-mx6/imx-regs.h | 64 ++++-- arch/arm/include/asm/arch-mx6/mx6-ddr.h | 45 ++++ arch/arm/include/asm/arch-mx6/mx6-pins.h | 2 + arch/arm/include/asm/arch-mx6/mx6ul-ddr.h | 45 ++++ arch/arm/include/asm/arch-mx6/mx6ul_pins.h | 1065 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-mx6/sys_proto.h | 4 +- arch/arm/include/asm/arch-vf610/crm_regs.h | 3 + arch/arm/include/asm/arch-vf610/imx-regs.h | 3 + arch/arm/include/asm/arch-vf610/iomux-vf610.h | 11 +- arch/arm/include/asm/imx-common/iomux-v3.h | 6 + board/compulab/cm_fx6/cm_fx6.c | 86 ++++--- board/compulab/cm_fx6/spl.c | 2 +- board/congatec/cgtqmx6eval/cgtqmx6eval.c | 353 +++++++++++++++++++++++++++- board/congatec/cgtqmx6eval/imximage.cfg | 128 +++++------ board/freescale/mx6qsabreauto/mx6qp.cfg | 145 ++++++++++++ board/freescale/mx6qsabreauto/mx6qsabreauto.c | 40 +++- board/freescale/mx6sabresd/mx6sabresd.c | 13 +- board/freescale/mx6sxsabresd/mx6sxsabresd.c | 3 +- board/freescale/mx6ul_14x14_evk/Kconfig | 15 ++ board/freescale/mx6ul_14x14_evk/MAINTAINERS | 6 + board/freescale/mx6ul_14x14_evk/Makefile | 6 + board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 636 +++++++++++++++++++++++++++++++++++++++++++++++++++ board/tqc/tqma6/Kconfig | 5 + board/tqc/tqma6/Makefile | 1 + board/tqc/tqma6/tqma6_wru4.c | 346 ++++++++++++++++++++++++++++ board/warp/warp.c | 50 ++++ configs/cgtqmx6qeval_defconfig | 3 + configs/cm_fx6_defconfig | 20 ++ configs/mx6qpsabreauto_defconfig | 4 + configs/mx6ul_14x14_evk_defconfig | 4 + configs/tqma6s_wru4_mmc_defconfig | 13 ++ drivers/gpio/mxc_gpio.c | 4 + drivers/i2c/mxc_i2c.c | 3 +- drivers/mmc/fsl_esdhc.c | 8 + drivers/mtd/spi/Kconfig | 44 ++++ drivers/net/fec_mxc.c | 20 +- drivers/power/pmic/Makefile | 1 + drivers/power/pmic/pmic_max77696.c | 32 +++ drivers/thermal/imx_thermal.c | 18 +- drivers/usb/Kconfig | 29 +++ drivers/usb/host/Kconfig | 7 + include/configs/aristainetos-common.h | 3 - include/configs/cgtqmx6eval.h | 165 +++++++++++--- include/configs/cm_fx6.h | 17 -- include/configs/embestmx6boards.h | 5 - include/configs/gw_ventana.h | 5 - include/configs/imx6_spl.h | 2 +- include/configs/mx53loco.h | 7 +- include/configs/mx6_common.h | 10 +- include/configs/mx6cuboxi.h | 2 - include/configs/mx6qsabreauto.h | 5 - include/configs/mx6sabre_common.h | 28 ++- include/configs/mx6sabresd.h | 5 - include/configs/mx6slevk.h | 5 - include/configs/mx6sxsabresd.h | 5 - include/configs/mx6ul_14x14_evk.h | 227 ++++++++++++++++++ include/configs/nitrogen6x.h | 5 - include/configs/novena.h | 6 - include/configs/ot1200.h | 4 - include/configs/platinum.h | 4 - include/configs/tbs2910.h | 6 - include/configs/tqma6.h | 6 +- include/configs/tqma6_wru4.h | 71 ++++++ include/configs/wandboard.h | 5 - include/configs/warp.h | 13 +- include/power/max77696_pmic.h | 60 +++++ include/thermal.h | 16 +- tools/imximage.c | 95 ++++++-- tools/imximage.h | 26 ++- 81 files changed, 4299 insertions(+), 548 deletions(-) create mode 100644 arch/arm/include/asm/arch-mx6/mx6ul-ddr.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6ul_pins.h create mode 100644 board/freescale/mx6qsabreauto/mx6qp.cfg create mode 100644 board/freescale/mx6ul_14x14_evk/Kconfig create mode 100644 board/freescale/mx6ul_14x14_evk/MAINTAINERS create mode 100644 board/freescale/mx6ul_14x14_evk/Makefile create mode 100644 board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c create mode 100644 board/tqc/tqma6/tqma6_wru4.c create mode 100644 configs/mx6qpsabreauto_defconfig create mode 100644 configs/mx6ul_14x14_evk_defconfig create mode 100644 configs/tqma6s_wru4_mmc_defconfig create mode 100644 drivers/power/pmic/pmic_max77696.c create mode 100644 include/configs/mx6ul_14x14_evk.h create mode 100644 include/configs/tqma6_wru4.h create mode 100644 include/power/max77696_pmic.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@denx.de =====================================================================