On Mon, Feb 27, 2017 at 06:02:18PM +0100, Stefano Babic wrote: > On 27/02/2017 17:41, Fabio Estevam wrote: > > Hi Stefano, > > > > On Mon, Feb 27, 2017 at 10:29 AM, Stefano Babic <sba...@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 > > > > In the tree together with Peter's there are also Markus', just fixes and > related to tqma6. I will propose I reset my tree to > 76cb4dbc5c1d33d1f251af2553db47d88c3e6a45, this generate a small PR as: > > 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 > 76cb4dbc5c1d33d1f251af2553db47d88c3e6a45 > > for you to fetch changes up to 76cb4dbc5c1d33d1f251af2553db47d88c3e6a45: > > Merge branch 'master' of git://git.denx.de/u-boot (2017-02-25 18:52:37 > +0100) > > ---------------------------------------------------------------- > Andrey Yurovsky (1): > mtd: nand: build MXS driver for MX7 as well > > Markus Niebel (6): > 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 > > 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 > > > Tom, should this ok ?
Drop the merge commit and then yes, looks reasonable, thanks! -- Tom
signature.asc
Description: Digital signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/listinfo/u-boot
