On 2016-07-19 07:18, stefano wrote: > Hi Stefan, > > On 18/07/2016 22:59, Stefan Agner wrote: >> On 2016-07-13 00:25, Stefan Agner wrote: >>> From: Stefan Agner <stefan.ag...@toradex.com> >>> >>> This patchset adds support for the Toradex i.MX 7Solo and 7Dual >>> based computer on modules Colibri iMX7S/iMX7D. >>> >>> It also brings several smaller i.MX 7 related fixes/cleanups. >> >> Is there anything holding us back merging this patchset? >> >> It touches several subsystems, ultimately the final patch adding the new >> board is depending on all of them. What is the plan how to merge it? >> > > I see all patches are assigned to me - that makes sense to avoid some > kind of breakages. > > IMHO patches 1-4, 6-8 are ready to be merged. The best plan could be I > start to apply them, and you resend an updated just for the ones to be > changed. This should makes integration easier.
Afait, 5 should be fine too. The i.MX 6 changes will be in a separate patch, and Tom agreed to the approach for the soc variable... Will resend 9. -- Stefan > > Stefano > >> -- >> Stefan >> >>> >>> Changes since v1: >>> - Dropped Ricoh RN5T567 PMIC support (for now) >>> - Use CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG for runtime variables >>> - Convert USB OTG Power Pin Polarity to Kconfig >>> - Use gpio_request in lcd_setup >>> >>> Stefan Agner (9): >>> dm: imx: serial: Support DTE mode when using driver model >>> usb: move CONFIG_USB_EHCI_MX7 to Kconfig >>> usb: ehci-mx6: configure power polarity in usb_power_config >>> usb: ehci-mx6: introduce config for high active power pin >>> mx7: set soc environment according to exact SoC type >>> mx7_common: Put display board info config into board file >>> mx7_common: use Kconfig for ARMv7 non-secure mode >>> imx_watchdog: add weak attribute to reset_cpu function >>> colibri_imx7: add Colibri iMX7S/iMX7D module support >>> >>> arch/arm/cpu/armv7/mx7/Kconfig | 9 + >>> arch/arm/cpu/armv7/mx7/soc.c | 14 + >>> board/toradex/colibri_imx7/Kconfig | 12 + >>> board/toradex/colibri_imx7/MAINTAINERS | 6 + >>> board/toradex/colibri_imx7/Makefile | 6 + >>> board/toradex/colibri_imx7/colibri_imx7.c | 420 >>> ++++++++++++++++++++++++++++++ >>> board/toradex/colibri_imx7/imximage.cfg | 150 +++++++++++ >>> configs/colibri_imx7_defconfig | 40 +++ >>> configs/mx7dsabresd_defconfig | 3 + >>> configs/warp7_defconfig | 4 + >>> drivers/serial/serial_mxc.c | 9 +- >>> drivers/usb/host/Kconfig | 16 ++ >>> drivers/usb/host/ehci-mx6.c | 14 +- >>> drivers/watchdog/imx_watchdog.c | 2 +- >>> include/configs/colibri_imx7.h | 248 ++++++++++++++++++ >>> include/configs/mx7_common.h | 10 +- >>> include/configs/mx7dsabresd.h | 4 +- >>> include/configs/warp7.h | 4 +- >>> include/dm/platform_data/serial_mxc.h | 1 + >>> 19 files changed, 953 insertions(+), 19 deletions(-) >>> create mode 100644 board/toradex/colibri_imx7/Kconfig >>> create mode 100644 board/toradex/colibri_imx7/MAINTAINERS >>> create mode 100644 board/toradex/colibri_imx7/Makefile >>> create mode 100644 board/toradex/colibri_imx7/colibri_imx7.c >>> create mode 100644 board/toradex/colibri_imx7/imximage.cfg >>> create mode 100644 configs/colibri_imx7_defconfig >>> create mode 100644 include/configs/colibri_imx7.h _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot