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

Albert ARIBAUD
2014-10-08T20:51:33Z

Hi Stefano,

On Wed, 08 Oct 2014 10:17:49 +0200, Stefano Babic <sbabic@denx.de>
wrote:

> Hi Albert,
>
> please pull from u-boot-imx, thanks !
>
> cm_fx6 is still broken in u-boot-imx, but after merging with Tom's tree
> it is built correctly.

Ok -- it has been building correctly in u-boot-arm/master for some time
already.

> The following changes since commit 2a8c9c86b92a9ccee3c27286de317e19bb0530b3:
>
> Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' (2014-09-21
> 16:56:44 +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 5e3a388cddce1685ccd9bc1b58ddb89a191ed88f:
>
> nitrogen6x: config: enable EXT4 filesystem (2014-10-06 17:57:23 +0200)
>
> ----------------------------------------------------------------
> Andrew Ruder (2):
> arm: mx31: use common timer functions
> arm: mx35: use common timer functions
>
> Christian Gmeiner (1):
> imx6: add Bachmann OT1200 board
>
> Diego Rondini (1):
> nitrogen6x: config: allow boot to USB stick
>
> Eric Nelson (23):
> nitrogen6x: Update DDR timings for 2G memory arrangement
> nitrogen6x: implement board_cfb_skip() to disable text output
> nitrogen6x: configure SD2 pads for SDIO on USDHC2
> nitrogen6x: power-down miscellanous peripherals
> nitrogen6x: staticize board file
> nitrogen6x: prevent warnings about board_ehci* callbacks
> nitrogen6x: display: add qvga panel
> nitrogen6x: display: add support for LG-9.7 LVDS display
> nitrogen6x: display: add LDB-WXGA-S for SPWG 1280x800 displays
> nitrogen6x: display: add support for fusion 7 display
> nitrogen6x: display: add svga display (800x600)
> nitrogen6x: display: add Ampire 1024x600 panel
> nitrogen6x: display: add wvga-lvds panel
> nitrogen6x: display use I2C detect for HDMI
> nitrogen6x: config: add USB Mass Storage (ums) support
> nitrogen6x: config: add initrd_high
> nitrogen6x: config: expose SATA, then MMC over USB
> nitrogen6x: config: enable USB keyboard support
> nitrogen6x: config: add CONFIG_CMD_MEMTEST
> nitrogen6x: config: enable "i2c edid"
> nitrogen6x: config: disable logo
> nitrogen6x: config: add gpio command
> nitrogen6x: config: enable Android fastboot
>
> Fabio Estevam (9):
> mx6sxsabresd: Staticize i2c_pad_info1
> mx6qsabreauto: Staticize when possible
> cm_fx6: Remove CONFIG_NETMASK
> mx51evk: Fix CONFIG_SYS_FSL_ESDHC_ADDR
> mx51evk: Add generic board support
> mx25pdk: Fix CONFIG_SYS_FSL_ESDHC_ADDR
> mx25pdk: Add generic board support
> wandboard: Select CONFIG_CMD_FUSE
> mx6sxsabresd: Fix PCI reset and power GPIO assignments
>
> Guillaume GARDET (1):
> imx: nitrogen6x: Make use of both uSD and SD slots to load script
> or kernel on Sabrelite board
>
> Kevin Mihelich (2):
> nitrogen6x: config: use FS_GENERIC load command
> nitrogen6x: config: enable EXT4 filesystem
>
> Marek Vasut (11):
> usb: ehci: mxs: Add board-specific callbacks
> arm: mxs: Wait when disabling VDDMEM current limiter
> arm: mxs: Wait for DRAM to start
> arm: mxs: olinuxino: Enable USB only when needed
> arm: mxs: olinuxino: Fine-tune DRAM configuration
> arm: m28evk: Test if bootscript exists before loading it
> arm: m53evk: Test if bootscript exists before loading it
> arm: m28evk: Enable FS_GENERIC
> arm: m53evk: Enable FS_GENERIC
> arm: m28evk: Zap superfluous tab in env
> arm: m53evk: Zap superfluous tab in env
>
> Nitin Garg (3):
> imx: ddr: Move mx6q_4x_mt41j128.cfg to mx6sabresd board
> imx: Support i.MX6 High Assurance Boot authentication
> imx6sx: Fix i.MX6SX HAB api function table offset
>
> Peng Fan (3):
> imx:mx6sxsabresd: change CONFIG_SYS_FSL_ESDHC_ADDR
> imx:mx6qarm2: change CONFIG_SYS_FSL_ESDHC_ADDR
> imx:mx6slevk: change CONFIG_SYS_FSL_ESDHC_ADDR
>
> Robert Winkler (1):
> nitrogen6x: display: add support lvds jeida screen
>
> Stefan Agner (2):
> mtd: nand: add Freescale vf610_nfc driver
> arm: vf610: add NAND support for vf610twr
>
> Stefan Roese (1):
> ARM: mx6: gw_ventana: Remove superfluous memset of GD in board_init_f
>
> Stefano Babic (3):
> Merge branch 'master' of git://git.denx.de/u-boot-arm
> imx: Fix warning by building vf610twr_nand
> Merge branch 'master' of git://git.denx.de/u-boot-arm
>
> Troy Kisky (4):
> nitrogen6x: simplify board_mmc_getcd
> nitrogen6x: configure SGTL5000, CSI camera clock outputs
> nitrogen6x: phy: add 100 us delay after phy reset
> nitrogen6x: config: allow more bootargs parameters
>
> Ye.Li (6):
> imx: mx6qarm2: Add the kernel FDT Loading support
> imx: mx6qarm2: Change the mmcroot and mmcpart env value
> imx: mx6: Checking PLL2 PFD0 and PFD2 for periph_clk before PFD reset
> usb: ehci-mx6: Rename the USB register base address
> imx: mx6dlarm2: Add support for i.MX6DL arm2 DDR3 board
> imx: mx6dlarm2: Add support for i.MX6Q/DL arm2 LPDDR2 boards
>
> arch/arm/Kconfig | 4 +
> arch/arm/cpu/arm1136/mx31/timer.c | 104
> +------
> arch/arm/cpu/arm1136/mx35/timer.c | 83
> ------
> arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 13 +-
> arch/arm/cpu/armv7/mx6/clock.c | 27 ++
> arch/arm/cpu/armv7/mx6/hab.c | 169
> ++++++++++-
> arch/arm/cpu/armv7/mx6/soc.c | 39 ++-
> arch/arm/include/asm/arch-mx31/imx-regs.h | 10 +
> arch/arm/include/asm/arch-mx35/imx-regs.h | 12 +
> arch/arm/include/asm/arch-mx6/clock.h | 1 +
> arch/arm/include/asm/arch-mx6/hab.h | 16 +-
> arch/arm/include/asm/arch-mx6/imx-regs.h | 9 +-
> board/bachmann/ot1200/Kconfig | 23 ++
> board/bachmann/ot1200/MAINTAINERS | 6 +
> board/bachmann/ot1200/Makefile | 9 +
> board/bachmann/ot1200/README | 20 ++
> board/{freescale/imx/ddr => bachmann/ot1200}/mx6q_4x_mt41j128.cfg | 0
> board/bachmann/ot1200/ot1200.c | 251
> ++++++++++++++++
> board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg | 24 +-
> board/boundary/nitrogen6x/nitrogen6x.c | 292
> +++++++++++++++++--
> board/congatec/cgtqmx6eval/imximage.cfg | 169
> +++++++++++
> board/freescale/mx6qarm2/MAINTAINERS | 4 +
> board/freescale/mx6qarm2/imximage.cfg | 189
> +++++++++++-
> board/freescale/mx6qarm2/imximage_mx6dl.cfg | 462
> +++++++++++++++++++++++++++++
> board/freescale/mx6qarm2/mx6qarm2.c | 11 +-
> board/freescale/mx6qsabreauto/mx6qsabreauto.c | 16 +-
> board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg | 169
> +++++++++++
> board/freescale/mx6sxsabresd/mx6sxsabresd.c | 2 +-
> board/freescale/vf610twr/MAINTAINERS | 1 +
> board/freescale/vf610twr/vf610twr.c | 47 ++-
> board/gateworks/gw_ventana/gw_ventana_spl.c | 7 -
> board/olimex/mx23_olinuxino/mx23_olinuxino.c | 46 ++-
> configs/cgtqmx6qeval_defconfig | 2 +-
> configs/mx6dlarm2_defconfig | 3 +
> configs/mx6dlarm2_lpddr2_defconfig | 3 +
> configs/mx6qarm2_defconfig | 2 +-
> configs/mx6qarm2_lpddr2_defconfig | 3 +
> configs/mx6qsabresd_defconfig | 2 +-
> configs/ot1200_defconfig | 3 +
> configs/vf610twr_defconfig | 2 +-
> configs/vf610twr_nand_defconfig | 3 +
> drivers/mtd/nand/Makefile | 1 +
> drivers/mtd/nand/vf610_nfc.c | 724
> ++++++++++++++++++++++++++++++++++++++++++++++
> drivers/usb/host/ehci-mx6.c | 4 +-
> drivers/usb/host/ehci-mxs.c | 16 +
> include/configs/cm_fx6.h | 1 -
> include/configs/m28evk.h | 13 +-
> include/configs/m53evk.h | 13 +-
> include/configs/mx25pdk.h | 3 +-
> include/configs/mx51evk.h | 3 +-
> include/configs/mx6qarm2.h | 49
> +++-
> include/configs/mx6slevk.h | 2 +-
> include/configs/mx6sxsabresd.h | 6 +-
> include/configs/nitrogen6x.h | 113
> ++++++--
> include/configs/ot1200.h | 197
> +++++++++++++
> include/configs/vf610twr.h | 46 ++-
> include/configs/wandboard.h | 5 +
> 57 files changed, 3115 insertions(+), 339 deletions(-)
> create mode 100644 board/bachmann/ot1200/Kconfig
> create mode 100644 board/bachmann/ot1200/MAINTAINERS
> create mode 100644 board/bachmann/ot1200/Makefile
> create mode 100644 board/bachmann/ot1200/README
> rename board/{freescale/imx/ddr =>
> bachmann/ot1200}/mx6q_4x_mt41j128.cfg (100%)
> create mode 100644 board/bachmann/ot1200/ot1200.c
> create mode 100644 board/congatec/cgtqmx6eval/imximage.cfg
> create mode 100644 board/freescale/mx6qarm2/imximage_mx6dl.cfg
> create mode 100644 board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg
> create mode 100644 configs/mx6dlarm2_defconfig
> create mode 100644 configs/mx6dlarm2_lpddr2_defconfig
> create mode 100644 configs/mx6qarm2_lpddr2_defconfig
> create mode 100644 configs/ot1200_defconfig
> create mode 100644 configs/vf610twr_nand_defconfig
> create mode 100644 drivers/mtd/nand/vf610_nfc.c
>
> Best regards,
> Stefano

Applied to u-boot-arm/master, thanks.

Amicalement,
--
Albert.