Message ID | 9703d063-e14c-5b08-1195-0038425c01a7@denx.de |
---|---|
State | Deferred |
Delegated to: | Tom Rini |
Headers | show |
On Mon, Feb 27, 2017 at 10:12:59AM +0100, Stefano Babic wrote: > Hi Tom, > > please pull from u-boot-imx, thanks ! > > The following changes since commit b24cf8540a85a9bf97975aadd6a7542f166c78a3: > > video: mxsfb: Fix reset hang when videomode variable is not present > (2017-02-22 21:47:59 +0100) > > are available in the git repository at: > > git://www.denx.de/git/u-boot-imx.git master > > for you to fetch changes up to 60a38e423b21a897b8fa0d9376d9370ea915ddd8: > > i.MX6Q: isiot: Switch the mmc env based on devno (2017-02-26 13:00:22 > +0100) > > ---------------------------------------------------------------- > Andrey Yurovsky (1): > mtd: nand: build MXS driver for MX7 as well > > Jagan Teki (25): > configs: imx6: Don't define USDHC2_BASE_ADDR > arm: imx6ul: Add Engicam Is.IoT MX6UL Starter Kit initial support > arm: dts: imx6ul-isiot: Add I2C nodes > imx6: isiotmx6ul: Add I2C support > arm: dts: imx6ul-isiot: Add FEC node > imx6: isiotmx6ul: Add FEC support > imx6: isiotmx6ul: Add NAND support > imx6: isiotmx6ul: Add nandboot env support > imx6ul: isiotmx6ul: Enable I2C support > i.MX6: engicam: Include dts files under MAINTAINERS > imx6: Add imx6_src_get_boot_mode > imx: spl: Update NAND bootmode detection bit > imx: Use IMX6_BMODE_* macros instead of numericals > imx6: Add src_base structure define macro > imx6: isiotmx6ul: Update SPL board boot order for eMMC > i.MX6UL: isiot: Add eMMC boot support > i.MX6UL: isiot: Add modeboot env via board_late_init > i.MX6UL: isiot: Add mmc_late_init > i.MX6UL: isiot: Switch the mmc env based on devno > arm: dts: imx6qdl-icore-rqs: Add eMMC node > imx6: icorem6_rqs: Update SPL board boot order for eMMC > imx6: icorem6_rqs: Add eMMC boot support > i.MX6Q: icorem6_rqs: Add modeboot env via board_late_init > i.MX6Q: icorem6_rqs: Add mmc_late_init > i.MX6Q: isiot: Switch the mmc env based on devno > > Markus Niebel (13): > arm: imx6: tqma6: add configurable CMA size > imx6: tqma6: rely on default setting for tftp and nfs > mx6: tqma6: fix typo in env > mx6: tqma6: add rootfsmode environment for mmc / sd > tqma6: fix rounding in env > tqma6: [cosmetic] sanitize environment defines > arm: imx6: tqma6: use CONFIG_TQM6x for SOM specific settings > arm: imx6: tqma6: add support for TQMa6DL variant > imx6: tqma6: implement power_init_board > imx6: tqma6: use lower driver stength for I2C pins > imx6: tqma6: disable spi CS unused in U-Boot > imx6: tqma6: adjust ethernet phy reset delay > mx6: tqma6: clear enet clk sel for mba6 > > Peng Fan (16): > imx: mx7ulp: Add mx7ulp to Kconfig > imx: mx7ulp: add registers header file > imx: mx7ulp: add iomux driver to support IOMUXC0 and IOMUXC1 > imx: mx7ulp: Add clock framework and functions > imx: mx7ulp: Add soc level initialization codes and functions > gpio: Add Rapid GPIO2P driver for i.MX7ULP > mxc_ocotp: Update driver to support OCOTP controller on i.MX7ULP > pinctrl: Add i.MX7ULP pinctrl driver > i2c: lpi2c: add lpi2c driver for i.MX7ULP > serial: lpuart: restructure lpuart driver > serial: lpuart: add i.MX7ULP support > mx7ulp: Add HAB boot support > arm: dts: add i.MX7ULP dtsi file > mmc: fsl_esdhc: support i.MX7ULP > imx: imx7ulp: add EVK board support > imx: mx7ulp_evk: enable mmc/regulator support > > Peter Robinson (3): > mx6sx: udoo_neo: Define the default serial console > mx6sx: udoo_neo: use different load address for ramdisk > mx6sx: udoo_neo: Enable distro boot options in config > > Stefano Babic (1): > Merge branch 'master' of git://git.denx.de/u-boot > > Ye Li (3): > imx: mx7ulp: Implement the clock functions for i2c driver > mx7ulp: Add iomux pins header file > wdog: Add the watchdog driver for MX7ULP. > > arch/arm/Kconfig | 7 + > arch/arm/Makefile | 2 +- > arch/arm/cpu/armv7/Makefile | 3 +- > arch/arm/cpu/armv7/mx6/Kconfig | 12 + > arch/arm/cpu/armv7/mx7ulp/Kconfig | 17 ++ > arch/arm/cpu/armv7/mx7ulp/Makefile | 8 + > arch/arm/cpu/armv7/mx7ulp/clock.c | 365 > +++++++++++++++++++++++++++ > arch/arm/cpu/armv7/mx7ulp/iomux.c | 70 ++++++ > arch/arm/cpu/armv7/mx7ulp/pcc.c | 286 > +++++++++++++++++++++ > arch/arm/cpu/armv7/mx7ulp/scg.c | 1086 > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > arch/arm/cpu/armv7/mx7ulp/soc.c | 247 > ++++++++++++++++++ > arch/arm/cpu/armv7/vf610/generic.c | 5 + > arch/arm/dts/Makefile | 7 +- > arch/arm/dts/imx6qdl-icore-rqs.dtsi | 22 ++ > arch/arm/dts/imx6ul-isiot-emmc.dts | 77 ++++++ > arch/arm/dts/imx6ul-isiot-mmc.dts | 50 ++++ > arch/arm/dts/imx6ul-isiot-nand.dts | 50 ++++ > arch/arm/dts/imx6ul-isiot.dtsi | 142 +++++++++++ > arch/arm/dts/imx7ulp-evk.dts | 426 > +++++++++++++++++++++++++++++++ > arch/arm/dts/imx7ulp-pinfunc.h | 882 > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > arch/arm/dts/imx7ulp-uboot.dtsi | 43 ++++ > arch/arm/dts/imx7ulp.dtsi | 598 > +++++++++++++++++++++++++++++++++++++++++++ > arch/arm/imx-common/Makefile | 4 + > arch/arm/imx-common/hab.c | 3 +- > arch/arm/imx-common/init.c | 10 + > arch/arm/imx-common/spl.c | 49 ++-- > arch/arm/include/asm/arch-fsl-layerscape/imx-regs.h | 42 ---- > arch/arm/include/asm/arch-imx/cpu.h | 2 + > arch/arm/include/asm/arch-ls102xa/imx-regs.h | 40 --- > arch/arm/include/asm/arch-mx6/imx-regs.h | 2 + > arch/arm/include/asm/arch-mx7ulp/clock.h | 43 ++++ > arch/arm/include/asm/arch-mx7ulp/gpio.h | 22 ++ > arch/arm/include/asm/arch-mx7ulp/imx-regs.h | 1120 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > arch/arm/include/asm/arch-mx7ulp/imx_lpi2c.h | 520 > ++++++++++++++++++++++++++++++++++++++ > arch/arm/include/asm/arch-mx7ulp/iomux.h | 95 +++++++ > arch/arm/include/asm/arch-mx7ulp/mx7ulp-pins.h | 910 > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > arch/arm/include/asm/arch-mx7ulp/pcc.h | 373 > +++++++++++++++++++++++++++ > arch/arm/include/asm/arch-mx7ulp/scg.h | 342 > +++++++++++++++++++++++++ > arch/arm/include/asm/arch-mx7ulp/sys_proto.h | 21 ++ > arch/arm/include/asm/arch-vf610/clock.h | 1 + > arch/arm/include/asm/arch-vf610/imx-regs.h | 28 --- > arch/arm/include/asm/imx-common/sys_proto.h | 49 ++++ > board/engicam/geam6ul/MAINTAINERS | 1 + > board/engicam/icorem6/MAINTAINERS | 3 + > board/engicam/icorem6_rqs/MAINTAINERS | 3 + > board/engicam/icorem6_rqs/icorem6_rqs.c | 96 ++++++- > board/engicam/isiotmx6ul/Kconfig | 12 + > board/engicam/isiotmx6ul/MAINTAINERS | 12 + > board/engicam/isiotmx6ul/Makefile | 6 + > board/engicam/isiotmx6ul/README | 28 +++ > board/engicam/isiotmx6ul/isiotmx6ul.c | 414 > ++++++++++++++++++++++++++++++ > board/freescale/mx7ulp_evk/Kconfig | 12 + > board/freescale/mx7ulp_evk/MAINTAINERS | 7 + > board/freescale/mx7ulp_evk/Makefile | 10 + > board/freescale/mx7ulp_evk/imximage.cfg | 137 ++++++++++ > board/freescale/mx7ulp_evk/mx7ulp_evk.c | 48 ++++ > board/freescale/mx7ulp_evk/plugin.S | 224 > +++++++++++++++++ > board/tqc/tqma6/Kconfig | 7 + > board/tqc/tqma6/README | 3 + > board/tqc/tqma6/tqma6.c | 31 ++- > board/tqc/tqma6/tqma6_mba6.c | 47 ++-- > board/tqc/tqma6/tqma6dl.cfg | 125 +++++++++ > configs/imx6dl_icore_rqs_mmc_defconfig | 1 + > configs/imx6q_icore_rqs_mmc_defconfig | 1 + > configs/imx6ul_isiot_emmc_defconfig | 40 +++ > configs/imx6ul_isiot_mmc_defconfig | 42 ++++ > configs/imx6ul_isiot_nand_defconfig | 43 ++++ > configs/mx7ulp_evk_defconfig | 25 ++ > configs/mx7ulp_evk_plugin_defconfig | 26 ++ > configs/tqma6dl_mba6_mmc_defconfig | 36 +++ > configs/tqma6dl_mba6_spi_defconfig | 37 +++ > configs/udoo_neo_defconfig | 11 +- > drivers/gpio/Kconfig | 7 + > drivers/gpio/Makefile | 1 + > drivers/gpio/imx_rgpio2p.c | 224 > +++++++++++++++++ > drivers/i2c/Kconfig | 6 + > drivers/i2c/Makefile | 1 + > drivers/i2c/imx_lpi2c.c | 462 > ++++++++++++++++++++++++++++++++++ > drivers/misc/mxc_ocotp.c | 52 +++- > drivers/mmc/fsl_esdhc.c | 8 + > drivers/mtd/nand/Kconfig | 2 +- > drivers/pinctrl/nxp/Kconfig | 14 ++ > drivers/pinctrl/nxp/Makefile | 1 + > drivers/pinctrl/nxp/pinctrl-imx.c | 10 +- > drivers/pinctrl/nxp/pinctrl-imx.h | 3 + > drivers/pinctrl/nxp/pinctrl-imx7ulp.c | 41 +++ > drivers/serial/serial_lpuart.c | 336 > ++++++++++++++++--------- > drivers/watchdog/Kconfig | 8 + > drivers/watchdog/Makefile | 1 + > drivers/watchdog/ulp_wdog.c | 98 ++++++++ > include/configs/imx6qdl_icore.h | 2 +- > include/configs/imx6qdl_icore_rqs.h | 36 ++- > include/configs/imx6ul_geam.h | 2 +- > include/configs/imx6ul_isiot.h | 199 +++++++++++++++ > include/configs/mx7ulp_evk.h | 198 +++++++++++++++ > include/configs/tqma6.h | 49 ++-- > include/configs/tqma6_mba6.h | 5 +- > include/configs/udoo_neo.h | 3 +- > include/dt-bindings/clock/imx7ulp-clock.h | 161 ++++++++++++ > include/fsl_lpuart.h | 72 ++++++ > 100 files changed, 11219 insertions(+), 352 deletions(-) This is too much too close to the release window, sorry.
On 27/02/2017 14:22, Tom Rini wrote: > On Mon, Feb 27, 2017 at 10:12:59AM +0100, Stefano Babic wrote: >> Hi Tom, >> >> please pull from u-boot-imx, thanks ! >> >> The following changes since commit b24cf8540a85a9bf97975aadd6a7542f166c78a3: >> >> video: mxsfb: Fix reset hang when videomode variable is not present >> (2017-02-22 21:47:59 +0100) >> >> are available in the git repository at: >> >> git://www.denx.de/git/u-boot-imx.git master >> >> for you to fetch changes up to 60a38e423b21a897b8fa0d9376d9370ea915ddd8: >> >> i.MX6Q: isiot: Switch the mmc env based on devno (2017-02-26 13:00:22 >> +0100) >> >> ---------------------------------------------------------------- > > This is too much too close to the release window, sorry. > ok - I push it to -next, and I send my PR again after release. Regards, Stefano
On Mon, Feb 27, 2017 at 02:29:38PM +0100, Stefano Babic wrote: > On 27/02/2017 14:22, Tom Rini wrote: > > On Mon, Feb 27, 2017 at 10:12:59AM +0100, Stefano Babic wrote: > >> Hi Tom, > >> > >> please pull from u-boot-imx, thanks ! > >> > >> The following changes since commit b24cf8540a85a9bf97975aadd6a7542f166c78a3: > >> > >> video: mxsfb: Fix reset hang when videomode variable is not present > >> (2017-02-22 21:47:59 +0100) > >> > >> are available in the git repository at: > >> > >> git://www.denx.de/git/u-boot-imx.git master > >> > >> for you to fetch changes up to 60a38e423b21a897b8fa0d9376d9370ea915ddd8: > >> > >> i.MX6Q: isiot: Switch the mmc env based on devno (2017-02-26 13:00:22 > >> +0100) > >> > >> ---------------------------------------------------------------- > > > > > This is too much too close to the release window, sorry. > > > > ok - I push it to -next, and I send my PR again after release. Thanks!
On Mon, Feb 27, 2017 at 1:29 PM, Stefano Babic <sbabic@denx.de> wrote: > On 27/02/2017 14:22, Tom Rini wrote: >> On Mon, Feb 27, 2017 at 10:12:59AM +0100, Stefano Babic wrote: >>> Hi Tom, >>> >>> please pull from u-boot-imx, thanks ! >>> >>> The following changes since commit b24cf8540a85a9bf97975aadd6a7542f166c78a3: >>> >>> video: mxsfb: Fix reset hang when videomode variable is not present >>> (2017-02-22 21:47:59 +0100) >>> >>> are available in the git repository at: >>> >>> git://www.denx.de/git/u-boot-imx.git master >>> >>> for you to fetch changes up to 60a38e423b21a897b8fa0d9376d9370ea915ddd8: >>> >>> i.MX6Q: isiot: Switch the mmc env based on devno (2017-02-26 13:00:22 >>> +0100) >>> >>> ---------------------------------------------------------------- > >> >> This is too much too close to the release window, sorry. >> > > ok - I push it to -next, and I send my PR again after release. Maybe do a more focuses -fixes PR?
Hi Stefano,
On Mon, Feb 27, 2017 at 10:29 AM, Stefano Babic <sbabic@denx.de> wrote:
> ok - I push it to -next, and I send my PR again after release.
Peter Robinson's patches are bug fixes for mx6sx udoo neo to work
correctly with distro config.
Can we get them in for 2017.03?
Thanks
On Mon, Feb 27, 2017 at 2:42 PM, Stefano Babic <sbabic@denx.de> wrote: > Hi Tom, > > please pull from u-boot-imx, thanks ! > > The following changes since commit b24cf8540a85a9bf97975aadd6a7542f166c78a3: > > video: mxsfb: Fix reset hang when videomode variable is not present > (2017-02-22 21:47:59 +0100) > > are available in the git repository at: > > git://www.denx.de/git/u-boot-imx.git master > > for you to fetch changes up to 60a38e423b21a897b8fa0d9376d9370ea915ddd8: > > i.MX6Q: isiot: Switch the mmc env based on devno (2017-02-26 13:00:22 > +0100) > > ---------------------------------------------------------------- > Andrey Yurovsky (1): > mtd: nand: build MXS driver for MX7 as well > > Jagan Teki (25): > configs: imx6: Don't define USDHC2_BASE_ADDR > arm: imx6ul: Add Engicam Is.IoT MX6UL Starter Kit initial support > arm: dts: imx6ul-isiot: Add I2C nodes > imx6: isiotmx6ul: Add I2C support > arm: dts: imx6ul-isiot: Add FEC node > imx6: isiotmx6ul: Add FEC support > imx6: isiotmx6ul: Add NAND support > imx6: isiotmx6ul: Add nandboot env support > imx6ul: isiotmx6ul: Enable I2C support > i.MX6: engicam: Include dts files under MAINTAINERS > imx6: Add imx6_src_get_boot_mode > imx: spl: Update NAND bootmode detection bit > imx: Use IMX6_BMODE_* macros instead of numericals > imx6: Add src_base structure define macro > imx6: isiotmx6ul: Update SPL board boot order for eMMC > i.MX6UL: isiot: Add eMMC boot support > i.MX6UL: isiot: Add modeboot env via board_late_init > i.MX6UL: isiot: Add mmc_late_init > i.MX6UL: isiot: Switch the mmc env based on devno > arm: dts: imx6qdl-icore-rqs: Add eMMC node > imx6: icorem6_rqs: Update SPL board boot order for eMMC > imx6: icorem6_rqs: Add eMMC boot support > i.MX6Q: icorem6_rqs: Add modeboot env via board_late_init > i.MX6Q: icorem6_rqs: Add mmc_late_init > i.MX6Q: isiot: Switch the mmc env based on devno These patches were initiated during early on MW, any possibility to merge these as well? thanks!
On Tue, Feb 28, 2017 at 09:39:01AM +0530, Jagan Teki wrote: > On Mon, Feb 27, 2017 at 2:42 PM, Stefano Babic <sbabic@denx.de> wrote: > > Hi Tom, > > > > please pull from u-boot-imx, thanks ! > > > > The following changes since commit b24cf8540a85a9bf97975aadd6a7542f166c78a3: > > > > video: mxsfb: Fix reset hang when videomode variable is not present > > (2017-02-22 21:47:59 +0100) > > > > are available in the git repository at: > > > > git://www.denx.de/git/u-boot-imx.git master > > > > for you to fetch changes up to 60a38e423b21a897b8fa0d9376d9370ea915ddd8: > > > > i.MX6Q: isiot: Switch the mmc env based on devno (2017-02-26 13:00:22 > > +0100) > > > > ---------------------------------------------------------------- > > Andrey Yurovsky (1): > > mtd: nand: build MXS driver for MX7 as well > > > > Jagan Teki (25): > > configs: imx6: Don't define USDHC2_BASE_ADDR > > arm: imx6ul: Add Engicam Is.IoT MX6UL Starter Kit initial support > > arm: dts: imx6ul-isiot: Add I2C nodes > > imx6: isiotmx6ul: Add I2C support > > arm: dts: imx6ul-isiot: Add FEC node > > imx6: isiotmx6ul: Add FEC support > > imx6: isiotmx6ul: Add NAND support > > imx6: isiotmx6ul: Add nandboot env support > > imx6ul: isiotmx6ul: Enable I2C support > > i.MX6: engicam: Include dts files under MAINTAINERS > > imx6: Add imx6_src_get_boot_mode > > imx: spl: Update NAND bootmode detection bit > > imx: Use IMX6_BMODE_* macros instead of numericals > > imx6: Add src_base structure define macro > > imx6: isiotmx6ul: Update SPL board boot order for eMMC > > i.MX6UL: isiot: Add eMMC boot support > > i.MX6UL: isiot: Add modeboot env via board_late_init > > i.MX6UL: isiot: Add mmc_late_init > > i.MX6UL: isiot: Switch the mmc env based on devno > > arm: dts: imx6qdl-icore-rqs: Add eMMC node > > imx6: icorem6_rqs: Update SPL board boot order for eMMC > > imx6: icorem6_rqs: Add eMMC boot support > > i.MX6Q: icorem6_rqs: Add modeboot env via board_late_init > > i.MX6Q: icorem6_rqs: Add mmc_late_init > > i.MX6Q: isiot: Switch the mmc env based on devno > > These patches were initiated during early on MW, any possibility to > merge these as well? As I was saying in my -rc3 release email, no. The next window is just around the corner.