[U-Boot] [PULL] : Please pull u-boot-imx

Albert ARIBAUD
2014-04-03T06:31:39Z

On Wed, 2 Apr 2014 20:00:07 +0200, Albert ARIBAUD
<albert.u.boot@aribaud.net> wrote:

> Hi Stefano,
>
> On Wed, 02 Apr 2014 18:54:14 +0200, Stefano Babic <sbabic@denx.de>
> wrote:
>
> > Hi Albert,
> >
> > please pull from u-boot-imx, thanks !
> >
> >
> > The following changes since commit 81a1d6173cd255c5c04c332ed69498c6e173515f:
> >
> > mx25pdk: Align the environment with other FSL boards (2014-03-12
> > 11:19:23 +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 fa9c02163247369aeb7c5dd02927547c8a5be8ef:
> >
> > mx6: add example DTB for mx6qsabreauto (2014-04-02 10:46:21 +0200)
> >
> > ----------------------------------------------------------------
> > Eric Nelson (1):
> > ARM: mx6: Disable PCIe on SABRE Lite/Nitrogen6x
> >
> > Fabio Estevam (1):
> > woodburn_sd: Remove CONFIG_BOOT_INTERNAL
> >
> > Marek Vasut (11):
> > arm: mxs: Adjust the load address of U-Boot and SPL for HAB
> > arm: mxs: Add support for generating signed BootStream
> > ARM: mxs: Add OCOTP driver
> > pci: mx6: Implement power callback
> > ARM: mx6: Add PCIe on SabreSDP
> > arm: mx5: Fix memory slowness on MX53QSB
> > arm: mx5: Avoid hardcoding memory sizes on MX53QSB
> > arm: mx5: Fix memory slowness on M53EVK
> > arm: mx5: Avoid hardcoding memory sizes on M53EVK
> > arm: mxs: Properly set GD pointer in SPL
> > arm: mxs: Add serial console support into SPL
> >
> > Stefano Babic (3):
> > mxs: fix warning in SPL with console support
> > imx: add rules for U-Boot DTB support
> > mx6: add example DTB for mx6qsabreauto
> >
> > Makefile | 8 +-
> > arch/arm/config.mk | 4 +
> > arch/arm/cpu/arm926ejs/mxs/Makefile | 77 ++++++
> > arch/arm/cpu/arm926ejs/mxs/mxsimage-signed.cfg | 10 +
> > arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg | 8 +-
> > arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg | 8 +-
> > arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 35 +++
> > arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds | 2 +-
> > arch/arm/dts/Makefile | 1 +
> > arch/arm/dts/imx6q-sabreauto.dts | 13 +
> > arch/arm/imx-common/Makefile | 8 +
> > board/denx/m53evk/m53evk.c | 31 ++-
> > board/freescale/mx53loco/mx53loco.c | 31 ++-
> > board/freescale/mx6sabresd/mx6sabresd.c | 11 +
> > drivers/misc/Makefile | 1 +
> > drivers/misc/mxs_ocotp.c | 311
> > ++++++++++++++++++++++++
> > drivers/pci/pcie_imx.c | 13 +-
> > include/configs/m53evk.h | 8 +-
> > include/configs/mx53loco.h | 10 +-
> > include/configs/mx6qsabreauto.h | 3 +
> > include/configs/mx6sabresd.h | 10 +
> > include/configs/mxs.h | 15 +-
> > include/configs/nitrogen6x.h | 1 -
> > include/configs/woodburn_sd.h | 2 -
> > 24 files changed, 581 insertions(+), 40 deletions(-)
> > create mode 100644 arch/arm/cpu/arm926ejs/mxs/mxsimage-signed.cfg
> > create mode 100644 arch/arm/dts/imx6q-sabreauto.dts
> > create mode 100644 drivers/misc/mxs_ocotp.c
> >
>
> This fails to merge with current u-boot-arm/master. Can you have a look?
> Or I have a closer look (much) later tonight.

Stefano, I had a look, and I'd rather you solved the merge conflict.

Amicalement,
--
Albert.