On Wed, Sep 17, 2014 at 11:40:43PM +0200, Albert ARIBAUD wrote: > Hi Tom, > > The following changes since commit > a7f99bf139b3aaa0d5494693fd0395084355e41a: > > arm: Fix _start for CONFIG_SYS_DV_NOR_BOOT_CFG (2014-09-11 18:04:39 > +0200) > > are available in the git repository at: > > git://git.denx.de/u-boot-arm master > > for you to fetch changes up to c292adae170fa8c27dca75963bdb0a9afc640e57: > > Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' (2014-09-17 > 23:35:34 +0200) > > NOTE: two boards are broken by this PR, trimslice and cm_fx6, due to > commits in the imx tree depending on some commits in the spi tree. Once > both this PR and the spi commits are in, both boards should build fine > again. > > ---------------------------------------------------------------- > > Albert ARIBAUD (1): > Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' > > Fabio Estevam (9): > net: fec_mxc: Adjust RX DMA alignment for mx6solox > net: fec_mxc: Poll FEC_TBD_READY after polling TDAR > tools: imximage: Fix the maximum DCD size for mx53/mx6 > mx6dlsabresd: Use its own DCD table > mx6qsabreauto: Remove imx6q-sabreauto.dts > mx6: imx-regs: Provide a structure for GPC registers > pcie_imx: Add mx6solox support > mx6sxsabresd: Add PCI support > README.imximage: Fix the maximum DCD size > > Guillaume GARDET (1): > imx: nitrogen6x: Replace 'fatload' by 'load' command in env > settings to be filesystem independent > > Nikita Kiryanov (16): > mx6: add clock enabling functions > compulab: eeprom: add support for defining eeprom i2c bus > sata: dwc_ahsata: implement sata_port_status > i2c: imx: add macros to setup pads for multiple SoC types > arm: mx6: ddr: cleanup > arm: mx6: ddr: do not write into reserved bit > arm: mx6: ddr: configure MMDC for slow_pd > arm: mx6: ddr: fix cs0_end calculation > arm: mx6: add get_cpu_type() > arm: mx6: add support for Compulab cm-fx6 CoM > arm: mx6: cm_fx6: add nand support > arm: mx6: cm_fx6: add ethernet support > arm: mx6: cm_fx6: add usb support > arm: mx6: cm_fx6: add i2c support > arm: mx6: cm_fx6: use eeprom > arm: mx6: cm_fx6: add sata support > > Nikolay Dimitrov (1): > mx6: Fix ECSPI typo in soc_boot_modes > > Stefan Agner (2): > arm: vf610: lpuart: fix status register handling > arm: vf610: lpuart: disable FIFO on initializaton > > Stefano Babic (1): > imx: Fix build of mx6sxsabresd > > Thierry Reding (1): > imx: ventana: Avoid undefined behaviour > > Tim Harvey (6): > imx: ventana: updated notes regarding NAND boot errata > imx: ventana: base SPL MMDC calibration on width and size not > board imx: ventana: add GW5520 support > imx: ventana: added cputype env var > pci: add support for board_pci_fixup_dev function > imx: ventana: add pci fixup for PLX PEX860x switch GPIO > > Ye.Li (4): > iMX6: Disable the L2 before chaning the PL310 latency > imximage: Fix imximage IVT bug for EIM-NOR boot > imx: mx6q/dlarm2: Change to use generic board > imx: mx6slevk: Change to use generic board > > arch/arm/Kconfig | 4 + > arch/arm/cpu/armv7/mx6/clock.c | 107 +++++- > arch/arm/cpu/armv7/mx6/ddr.c | 277 ++++++++-------- > arch/arm/cpu/armv7/mx6/soc.c | 11 +- > arch/arm/dts/Makefile | 1 - > arch/arm/dts/imx6q-sabreauto.dts | 13 - > arch/arm/include/asm/arch-mx6/clock.h | 5 + > arch/arm/include/asm/arch-mx6/imx-regs.h | 13 + > arch/arm/include/asm/arch-mx6/iomux.h | 9 + > arch/arm/include/asm/arch-mx6/sys_proto.h | 5 +- > arch/arm/include/asm/imx-common/mxc_i2c.h | 33 ++ > board/compulab/cm_fx6/Kconfig | 23 ++ > board/compulab/cm_fx6/MAINTAINERS | 6 + > board/compulab/cm_fx6/Makefile | 12 + > board/compulab/cm_fx6/cm_fx6.c | 483 > ++++++++++++++++++++++++++++ > board/compulab/cm_fx6/common.c | 84 +++++ > board/compulab/cm_fx6/common.h | 37 +++ > board/compulab/cm_fx6/imximage.cfg | 8 + > board/compulab/cm_fx6/spl.c | 366 > +++++++++++++++++++++ board/compulab/common/eeprom.c | > 13 +- board/freescale/mx6sabresd/mx6dlsabresd.cfg | 131 ++++++++ > board/gateworks/gw_ventana/eeprom.c | 3 + > board/gateworks/gw_ventana/gsc.c | 4 + > board/gateworks/gw_ventana/gw_ventana.c | 118 ++++++- > board/gateworks/gw_ventana/gw_ventana_spl.c | 189 ++++++----- > board/gateworks/gw_ventana/ventana_eeprom.h | 1 + > configs/cm_fx6_defconfig | 4 + > configs/mx6dlsabresd_defconfig | 2 +- > doc/README.imximage | 2 +- > drivers/block/dwc_ahsata.c | 17 + > drivers/net/fec_mxc.c | 42 ++- > drivers/pci/pci.c | 4 + > drivers/pci/pcie_imx.c | 40 ++- > drivers/serial/serial_lpuart.c | 19 +- > include/configs/cm_fx6.h | 290 +++++++++++++++++ > include/configs/cm_t335.h | 1 + > include/configs/cm_t35.h | 1 + > include/configs/cm_t54.h | 1 + > include/configs/gw_ventana.h | 1 + > include/configs/mx6qarm2.h | 2 + > include/configs/mx6qsabreauto.h | 3 - > include/configs/mx6slevk.h | 2 + > include/configs/mx6sxsabresd.h | 10 + > include/configs/nitrogen6x.h | 6 +- > include/pci.h | 7 + > include/sata.h | 1 + > tools/imximage.c | 7 + > tools/imximage.h | 2 +- 48 files changed, > 2140 insertions(+), 280 deletions(-) delete mode 100644 > arch/arm/dts/imx6q-sabreauto.dts create mode 100644 > board/compulab/cm_fx6/Kconfig create mode 100644 > board/compulab/cm_fx6/MAINTAINERS create mode 100644 > board/compulab/cm_fx6/Makefile create mode 100644 > board/compulab/cm_fx6/cm_fx6.c create mode 100644 > board/compulab/cm_fx6/common.c create mode 100644 > board/compulab/cm_fx6/common.h create mode 100644 > board/compulab/cm_fx6/imximage.cfg create mode 100644 > board/compulab/cm_fx6/spl.c create mode 100644 > board/freescale/mx6sabresd/mx6dlsabresd.cfg create mode 100644 > configs/cm_fx6_defconfig create mode 100644 include/configs/cm_fx6.h
Applied to u-boot/master, thanks! -- Tom
signature.asc
Description: Digital signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot