: Please pull u-boot-imx

GIT PULL Stefano Babic 2 participants 8 messages Apr 2, 2014 – Apr 5, 2014

lore

Share & tools

lore

Stefano Babic

author

2014-04-02 16:54 UTC #0 lore raw

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

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
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
=====================================================================

Albert ARIBAUD

2014-04-02 18:00 UTC #1 lore raw

Hi Stefano,

Quoted 64 lines · Stefano Babic

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 +

Quoted 9 lines

 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.

Amicalement,

Signature · 1 line

Albert.

Albert ARIBAUD

2014-04-03 06:31 UTC #2 lore raw

Quoted 79 lines · Albert ARIBAUD

Hi Stefano,
Quoted 64 lines · Stefano Babic
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 +
Quoted 9 lines
 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

Quoted 2 lines

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,

Signature · 1 line

Albert.

Stefano Babic

author

2014-04-03 07:32 UTC #3 lore raw

Hi Albert,

Quoted 82 lines · Albert ARIBAUD

Quoted 79 lines · Albert ARIBAUD
Hi Stefano,
Quoted 73 lines · Stefano Babic
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

Quoted 5 lines

Quoted 2 lines
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.

Of course, I check this issue !

Regards,
Stefano

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
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
=====================================================================

Stefano Babic

author

2014-04-04 13:52 UTC #4 lore raw

Hi Albert,

Quoted 4 lines · Stefano Babic

Quoted 4 lines
Quoted 2 lines
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.

Conflicts are solved - I have already pull u-boot-arm/master. I hope you have no problem to pull u-boot-imx now.

Thanks,
Stefano

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
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
=====================================================================

Albert ARIBAUD

2014-04-05 08:22 UTC #5 lore raw

Hi Stefano,

Quoted 11 lines · Stefano Babic

Hi Albert,
Quoted 4 lines · Stefano Babic
Quoted 4 lines
Quoted 2 lines
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.
Conflicts are solved - I have already pull u-boot-arm/master. I hope you have no problem to pull u-boot-imx now.

Thanks. Can you just send out a new PR?

Quoted 2 lines

Thanks,
Stefano

Amicalement,

Signature · 1 line

Albert.

Albert ARIBAUD

2014-04-05 11:03 UTC #6 lore raw

Quoted 12 lines · Albert ARIBAUD

Hi Stefano,
Quoted 7 lines · Stefano Babic
Hi Albert,
Quoted 3 lines · Stefano Babic
Quoted 3 lines
Quoted 2 lines
This fails to merge with current u-boot-arm/master. Can you have a look? Or I have a closer look (much) later tonight.

Quoted 6 lines

Quoted 4 lines
Quoted 1 line
Quoted 1 line
Stefano, I had a look, and I'd rather you solved the merge conflict.
Conflicts are solved - I have already pull u-boot-arm/master. I hope you have no problem to pull u-boot-imx now.
Thanks. Can you just send out a new PR?

(meanwhile, I'm preparing the tests and ARM PR)

Amicalement,

Signature · 1 line

Albert.

Stefano Babic

author

2014-04-05 12:09 UTC #7 lore raw

Quoted 15 lines · Albert ARIBAUD

Quoted 12 lines · Albert ARIBAUD
Hi Stefano,
Quoted 7 lines · Stefano Babic
Hi Albert,
Quoted 3 lines · Stefano Babic
Quoted 3 lines
Quoted 2 lines
This fails to merge with current u-boot-arm/master. Can you have a look? Or I have a closer look (much) later tonight.

Quoted 7 lines

Quoted 6 lines
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Stefano, I had a look, and I'd rather you solved the merge conflict.
Conflicts are solved - I have already pull u-boot-arm/master. I hope you have no problem to pull u-boot-imx now.
Thanks. Can you just send out a new PR?

Done !

Thanks,
Stefano

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
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
=====================================================================