Hi Tom,

please pull from u-boot-imx, thanks !

The following changes since commit fa8967cfbaed5582ba987756fa9f0470a9affbf4:

Merge git://git.denx.de/u-boot-uniphier (2017-05-17 14:13:58 -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 5c84ad097d829bb1e6460438f33e1536b23b3c9b:

Merge branch 'master' of git://git.denx.de/u-boot-imx (2017-05-18 11:53:55 +0200)

---------------------------------------------------------------- Andy Duan (4): net: fec_mxc: avoid transfer dev_id -1 to get mac address from fuse net: fec_mxc: specify the registered eth index by dev_id net: fec_mxc: avoid transfer dev_id -1 to get mac address from fuse net: fec_mxc: specify the registered eth index by dev_id

Fabio Estevam (5): mx25pdk: Add fuse API support mx25pdk: Add fuse API support mx6sabresd: Prepare for supporting MX6DL mx6sabresd: Add SPL support for the mx6dl variant mx6sabresd: Remove non-SPL targets

Jagan Teki (32): icorem6: Add modeboot env via board_late_init icorem6: Add mmc_late_init geam6ul: Add modeboot env via board_late_init geam6ul: Add mmc_late_init engicam: Set fdt_file env during run-time icorem6: Make SPL to pick suitable fdt engicam: Move uart mux init to SPL icorem6: Use proper iomux_ddr_regs drive strength values icorem6: Use drive strength macros i.MX6UL: geam6ul: Add SETUP_IOMUX_PADS isiot: Fix to use usdhc2_pads for mmc2 i.MX6UL: isiot: Add SETUP_IOMUX_PADS icorem6[_rqs]: Move the spl code common geam6/isiot: Move the spl code common engicam: common: Move common board code engicam: common: Move board_late_init icorem6: Add modeboot env via board_late_init icorem6: Add mmc_late_init geam6ul: Add modeboot env via board_late_init geam6ul: Add mmc_late_init engicam: Set fdt_file env during run-time icorem6: Make SPL to pick suitable fdt engicam: Move uart mux init to SPL icorem6: Use proper iomux_ddr_regs drive strength values icorem6: Use drive strength macros i.MX6UL: geam6ul: Add SETUP_IOMUX_PADS isiot: Fix to use usdhc2_pads for mmc2 i.MX6UL: isiot: Add SETUP_IOMUX_PADS icorem6[_rqs]: Move the spl code common geam6/isiot: Move the spl code common engicam: common: Move common board code engicam: common: Move board_late_init

Peng Fan (22): net: fec: do not access reserved register for i.MX6ULL imx-common: timer: clean up imx: thermal: update imx6 thermal driver according new equation thermal: imx: fix calculation imx-common: rdc-sema: correct return value net: fec: do not access reserved register for i.MX6ULL imx-common: timer: clean up imx: thermal: update imx6 thermal driver according new equation thermal: imx: fix calculation imx-common: rdc-sema: correct return value arm: dts: imx7: sync with Linux arm: dts: imx7d-sdb add basic dts arm: dts: imx7d-sdb: add spi gpio node arm: dts: imx7d-sdb: add regulator node for usb and mmc arm: dts: imx7d-sdb: add i2c support arm: dts: imx7d-sdb: add usdhc support spi: kconfig: add soft spi Kconfig entry gpio: 74x164: make oe-pins optional imx: mx7dsabresd: enable more DM drivers imx: mx7dsabresd: reset ENET_RST_B imx: mx7dsabresd: switch to DM USB pinctrl: imx: fix memory leak

Stefano Babic (3): Merge branch 'master' of git://git.denx.de/u-boot imx: mx7dsabresd: fix secure config after switching to DM Merge branch 'master' of git://git.denx.de/u-boot-imx

Tim Harvey (2): imx: ventana: fix GW520x external watchdog dt update imx: ventana: update imx wdog external reset dt property

arch/arm/cpu/armv7/mx6/Kconfig | 6 + arch/arm/dts/Makefile | 3 +- arch/arm/dts/imx7-colibri.dts | 10 +- arch/arm/dts/imx7.dtsi | 194 ------ arch/arm/dts/imx7d-pinfunc.h | 111 ++-- arch/arm/dts/imx7d-sdb.dts | 309 ++++++++++ arch/arm/dts/imx7d.dtsi | 140 +++++ arch/arm/dts/imx7s.dtsi | 999 +++++++++++++++++++++++++++++++ arch/arm/imx-common/rdc-sema.c | 2 +- arch/arm/imx-common/timer.c | 3 - arch/arm/include/asm/imx-common/iomux-v3.h | 6 + board/engicam/common/Makefile | 7 + board/engicam/common/board.c | 82 +++ board/engicam/common/board.h | 12 + board/engicam/common/spl.c | 393 ++++++++++++ board/engicam/geam6ul/geam6ul.c | 206 +------ board/engicam/icorem6/MAINTAINERS | 6 +- board/engicam/icorem6/icorem6.c | 330 +--------- board/engicam/icorem6_rqs/MAINTAINERS | 3 +- board/engicam/icorem6_rqs/icorem6_rqs.c | 352 +---------- board/engicam/isiotmx6ul/isiotmx6ul.c | 261 ++------ board/freescale/mx6sabresd/mx6dlsabresd.cfg | 131 ---- board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg | 169 ------ board/freescale/mx6sabresd/mx6sabresd.c | 341 +++++++---- board/freescale/mx7dsabresd/mx7dsabresd.c | 326 +--------- board/gateworks/gw_ventana/gw_ventana.c | 31 +- configs/imx6dl_icore_mmc_defconfig | 44 -- configs/imx6dl_icore_nand_defconfig | 45 -- configs/imx6dl_icore_rqs_mmc_defconfig | 41 -- configs/imx6q_icore_nand_defconfig | 45 -- configs/{imx6q_icore_mmc_defconfig => imx6qdl_icore_mmc_defconfig} | 2 +- ...mx6q_icore_rqs_mmc_defconfig => imx6qdl_icore_rqs_mmc_defconfig} | 2 +- configs/imx6ul_geam_mmc_defconfig | 1 - configs/imx6ul_geam_nand_defconfig | 1 - configs/imx6ul_isiot_emmc_defconfig | 1 - configs/imx6ul_isiot_mmc_defconfig | 1 - configs/imx6ul_isiot_nand_defconfig | 1 - configs/mx6dlsabresd_defconfig | 44 -- configs/mx6qsabresd_defconfig | 44 -- configs/mx6sabresd_spl_defconfig | 2 +- configs/mx7dsabresd_defconfig | 25 +- configs/mx7dsabresd_secure_defconfig | 26 +- drivers/gpio/74x164_gpio.c | 3 +- drivers/net/fec_mxc.c | 17 +- drivers/pinctrl/nxp/pinctrl-imx.c | 4 + drivers/spi/Kconfig | 6 + drivers/thermal/imx_thermal.c | 44 +- include/configs/imx6qdl_icore.h | 39 +- include/configs/imx6qdl_icore_rqs.h | 1 - include/configs/imx6ul_geam.h | 38 +- include/configs/imx6ul_isiot.h | 1 - include/configs/mx25pdk.h | 4 + include/configs/mx7dsabresd.h | 14 - include/dt-bindings/clock/imx7d-clock.h | 454 ++++++++++++++ 54 files changed, 2989 insertions(+), 2394 deletions(-) delete mode 100644 arch/arm/dts/imx7.dtsi create mode 100644 arch/arm/dts/imx7d-sdb.dts create mode 100644 arch/arm/dts/imx7d.dtsi create mode 100644 arch/arm/dts/imx7s.dtsi create mode 100644 board/engicam/common/Makefile create mode 100644 board/engicam/common/board.c create mode 100644 board/engicam/common/board.h create mode 100644 board/engicam/common/spl.c delete mode 100644 board/freescale/mx6sabresd/mx6dlsabresd.cfg delete mode 100644 board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg delete mode 100644 configs/imx6dl_icore_mmc_defconfig delete mode 100644 configs/imx6dl_icore_nand_defconfig delete mode 100644 configs/imx6dl_icore_rqs_mmc_defconfig delete mode 100644 configs/imx6q_icore_nand_defconfig rename configs/{imx6q_icore_mmc_defconfig => imx6qdl_icore_mmc_defconfig} (96%) rename configs/{imx6q_icore_rqs_mmc_defconfig => imx6qdl_icore_rqs_mmc_defconfig} (95%) delete mode 100644 configs/mx6dlsabresd_defconfig delete mode 100644 configs/mx6qsabresd_defconfig create mode 100644 include/dt-bindings/clock/imx7d-clock.h

Best regards, Stefano