From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Babic Date: Fri, 28 Oct 2016 16:44:35 +0200 Subject: [U-Boot] [PULL] Please pull u-boot-imx Message-ID: 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 ! There are two major patchsets in this PR: - plugin support from Peng - Jagan's support for Engicam i.CoreM6 , with several move to Kconfig. The following changes since commit ebf7fff20ab8127f318b238e47a21856497bd6fe: spl: move FDT_FIXUP_PARTITIONS to Kconfig (2016-10-15 08:12:46 -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 1c140f7bbf4a008fcd78b407ea80c60a2a18fc1f: imx6: icorem6: Add default mtd nand partition table (2016-10-26 19:00:06 +0200) ---------------------------------------------------------------- Diego Dorta (2): mx6sabresd: Add Falcon mode support mx6sabresd: Add README file Gary Bisson (4): arm: imx-common: add SECURE_BOOT option to Kconfig mx6_common: add secure boot support mx7_common: add secure boot support nitrogen6x: add secure boot support Jagan Teki (21): serial: Kconfig: Add MXC_UART entry thermal: Kconfig: Add IMX_THERMAL entry config: Move CONFIG_DEFAULT_FDT_FILE to defconfigs arm: imx: Add Engicam i.CoreM6 QDL Starter Kit initial support net: Kconfig: Add FEC_MXC entry imx6: icorem6: Add ENET support imx: s/docs\/README.imximage/doc\/README.imximage/g arm: dts: Add devicetree for i.MX6DL arm: dts: Add devicetree for i.MX6DQL arm: dts: imx6dl: Add pinctrl defines dt-bindings: clock: imx6qdl: Add clock defines arm: imx6q: Add devicetree support for Engicam i.CoreM6 DualLite/Solo imx6q: icorem6: Enable pinctrl driver engicam: icorem6: Add DM_GPIO, DM_MMC support arm: dts: Add devicetree for i.MX6Q arm: dts: imx6q: Add pinctrl defines arm: imx6q: Add devicetree support for Engicam i.CoreM6 Quad/Dual mtd: nand: Kconfig: Add NAND_MXS entry imx6: icorem6: Add NAND support imx6: icorem6: Enable MTD device support imx6: icorem6: Add default mtd nand partition table Peng Fan (9): arm: imx-common: introduce back usec2ticks tools: imximage: add plugin support imx: mx6: Add plugin support imx: mx7: Add plugin support imx-common: introduce USE_IMXIMG_PLUGIN Kconfig imx-common: compile plugin code imx: mx6ullevk: support plugin imx: mx6ullevk: correct boot device macro imx: mx6ull_14x14_evk: add plugin defconfig arch/arm/cpu/armv7/mx6/Kconfig | 11 ++ arch/arm/dts/Makefile | 4 +- arch/arm/dts/imx6dl-icore.dts | 59 ++++++ arch/arm/dts/imx6dl-pinfunc.h | 1091 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6dl.dtsi | 133 +++++++++++++ arch/arm/dts/imx6q-icore.dts | 59 ++++++ arch/arm/dts/imx6q-pinfunc.h | 1047 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6q.dtsi | 300 +++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-icore.dtsi | 196 +++++++++++++++++++ arch/arm/dts/imx6qdl.dtsi | 1281 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/imx-common/Kconfig | 14 ++ arch/arm/imx-common/Makefile | 29 ++- arch/arm/imx-common/timer.c | 16 ++ arch/arm/include/asm/arch-mx6/mx6_plugin.S | 159 ++++++++++++++++ arch/arm/include/asm/arch-mx7/mx7_plugin.S | 111 +++++++++++ arch/arm/include/asm/imx-common/sys_proto.h | 2 + board/barco/titanium/imximage.cfg | 2 +- board/boundary/nitrogen6x/nitrogen6dl.cfg | 3 + board/boundary/nitrogen6x/nitrogen6dl2g.cfg | 3 + board/boundary/nitrogen6x/nitrogen6q.cfg | 3 + board/boundary/nitrogen6x/nitrogen6q2g.cfg | 3 + board/boundary/nitrogen6x/nitrogen6s.cfg | 3 + board/boundary/nitrogen6x/nitrogen6s1g.cfg | 3 + board/ccv/xpress/imximage.cfg | 2 +- board/denx/m53evk/imximage.cfg | 2 +- board/engicam/icorem6/Kconfig | 12 ++ board/engicam/icorem6/MAINTAINERS | 6 + board/engicam/icorem6/Makefile | 6 + board/engicam/icorem6/README | 38 ++++ board/engicam/icorem6/icorem6.c | 537 +++++++++++++++++++++++++++++++++++++++++++++++++++ board/freescale/mx6sabresd/README | 103 ++++++++++ board/freescale/mx6sabresd/mx6dlsabresd.cfg | 2 +- board/freescale/mx6sabresd/mx6sabresd.c | 12 ++ board/freescale/mx6slevk/imximage.cfg | 2 +- board/freescale/mx6ullevk/imximage.cfg | 8 +- board/freescale/mx6ullevk/plugin.S | 139 ++++++++++++++ board/freescale/mx7dsabresd/imximage.cfg | 2 +- board/freescale/s32v234evb/s32v234evb.cfg | 2 +- board/freescale/vf610twr/imximage.cfg | 2 +- board/phytec/pcm052/imximage.cfg | 2 +- board/technexion/pico-imx6ul/imximage.cfg | 2 +- board/toradex/colibri_imx7/imximage.cfg | 2 +- board/toradex/colibri_vf/imximage.cfg | 2 +- board/warp/imximage.cfg | 2 +- board/warp7/imximage.cfg | 2 +- common/Kconfig | 5 + configs/dms-ba16-1g_defconfig | 1 + configs/dms-ba16_defconfig | 1 + configs/ge_b450v3_defconfig | 1 + configs/ge_b650v3_defconfig | 1 + configs/ge_b850v3_defconfig | 1 + configs/imx6qdl_icore_mmc_defconfig | 44 +++++ configs/imx6qdl_icore_nand_defconfig | 39 ++++ configs/mx25pdk_defconfig | 1 + configs/mx53ard_defconfig | 1 + configs/mx6ull_14x14_evk_plugin_defconfig | 33 ++++ configs/pico-imx6ul_defconfig | 1 + configs/tqma6q_mba6_mmc_defconfig | 1 + configs/tqma6q_mba6_spi_defconfig | 1 + configs/tqma6s_mba6_mmc_defconfig | 1 + configs/tqma6s_mba6_spi_defconfig | 1 + configs/tqma6s_wru4_mmc_defconfig | 1 + configs/zc5202_defconfig | 1 + configs/zc5601_defconfig | 1 + drivers/mtd/nand/Kconfig | 7 + drivers/net/Kconfig | 7 + drivers/serial/Kconfig | 7 + drivers/thermal/Kconfig | 13 ++ include/configs/advantech_dms-ba16.h | 1 - include/configs/colibri_imx7.h | 4 - include/configs/ge_bx50v3.h | 4 - include/configs/imx6qdl_icore.h | 167 ++++++++++++++++ include/configs/mx25pdk.h | 2 - include/configs/mx53ard.h | 2 - include/configs/mx6_common.h | 9 + include/configs/mx6sabresd.h | 12 ++ include/configs/mx7_common.h | 9 + include/configs/mx7dsabresd.h | 4 - include/configs/pico-imx6ul.h | 2 - include/configs/tqma6_mba6.h | 6 - include/configs/tqma6_wru4.h | 2 - include/configs/zc5202.h | 2 - include/configs/zc5601.h | 2 - include/dt-bindings/clock/imx6qdl-clock.h | 274 ++++++++++++++++++++++++++ tools/imximage.c | 283 +++++++++++++++++++++------ tools/imximage.h | 7 +- 86 files changed, 6265 insertions(+), 116 deletions(-) create mode 100644 arch/arm/dts/imx6dl-icore.dts create mode 100644 arch/arm/dts/imx6dl-pinfunc.h create mode 100644 arch/arm/dts/imx6dl.dtsi create mode 100644 arch/arm/dts/imx6q-icore.dts create mode 100644 arch/arm/dts/imx6q-pinfunc.h create mode 100644 arch/arm/dts/imx6q.dtsi create mode 100644 arch/arm/dts/imx6qdl-icore.dtsi create mode 100644 arch/arm/dts/imx6qdl.dtsi create mode 100644 arch/arm/include/asm/arch-mx6/mx6_plugin.S create mode 100644 arch/arm/include/asm/arch-mx7/mx7_plugin.S create mode 100644 board/engicam/icorem6/Kconfig create mode 100644 board/engicam/icorem6/MAINTAINERS create mode 100644 board/engicam/icorem6/Makefile create mode 100644 board/engicam/icorem6/README create mode 100644 board/engicam/icorem6/icorem6.c create mode 100644 board/freescale/mx6sabresd/README create mode 100644 board/freescale/mx6ullevk/plugin.S create mode 100644 configs/imx6qdl_icore_mmc_defconfig create mode 100644 configs/imx6qdl_icore_nand_defconfig create mode 100644 configs/mx6ull_14x14_evk_plugin_defconfig create mode 100644 include/configs/imx6qdl_icore.h create mode 100644 include/dt-bindings/clock/imx6qdl-clock.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 =====================================================================