Skip to contentSkip to conversation

Please pull u-boot-imx

GIT PULL Stefano Babic 4 participants 9 messages Sep 12, 2014 – Sep 17, 2014

lore
Share & tools
lore
#0 lore raw

Hi Albert,

please pull from u-boot-imx, thanks !

The board cm_fx6 cannot be built due to a couple of missing patches that are already merged into u-boot-spi. Please ignore this issue, the board will be compiled clean at the next iteration after Jagan's tree will be merged by Tom.

The following changes since commit a6bc0195dba895fa0e9facc718d17eb098695685:

Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
(2014-09-09 09:19:10 +0200)

are available in the git repository at:

git://www.denx.de/git/u-boot-imx.git master

for you to fetch changes up to 4c97f16911e229f6d5bbea5bee52449916e5fa92:

imx: mx6slevk: Change to use generic board (2014-09-11 11:04:26 +0200)

----------------------------------------------------------------
Fabio Estevam (9):
net: fec_mxc: Adjust RX DMA alignment for mx6solox
net: fec_mxc: Poll FEC_TBD_READY after polling TDAR
tools: imximage: Fix the maximum DCD size for mx53/mx6
mx6dlsabresd: Use its own DCD table
mx6qsabreauto: Remove imx6q-sabreauto.dts
mx6: imx-regs: Provide a structure for GPC registers
pcie_imx: Add mx6solox support
mx6sxsabresd: Add PCI support README.imximage: Fix the maximum DCD size

Guillaume GARDET (1):
imx: nitrogen6x: Replace 'fatload' by 'load' command in env
settings to be filesystem independent

Nikita Kiryanov (16):
mx6: add clock enabling functions
compulab: eeprom: add support for defining eeprom i2c bus
sata: dwc_ahsata: implement sata_port_status
i2c: imx: add macros to setup pads for multiple SoC types
arm: mx6: ddr: cleanup
arm: mx6: ddr: do not write into reserved bit
arm: mx6: ddr: configure MMDC for slow_pd
arm: mx6: ddr: fix cs0_end calculation
arm: mx6: add get_cpu_type()
arm: mx6: add support for Compulab cm-fx6 CoM
arm: mx6: cm_fx6: add nand support
arm: mx6: cm_fx6: add ethernet support
arm: mx6: cm_fx6: add usb support
arm: mx6: cm_fx6: add i2c support
arm: mx6: cm_fx6: use eeprom
arm: mx6: cm_fx6: add sata support

Nikolay Dimitrov (1):
mx6: Fix ECSPI typo in soc_boot_modes

Stefan Agner (2):
arm: vf610: lpuart: fix status register handling
arm: vf610: lpuart: disable FIFO on initializaton

Stefano Babic (1):
imx: Fix build of mx6sxsabresd

Thierry Reding (1):
imx: ventana: Avoid undefined behaviour

Tim Harvey (6):
imx: ventana: updated notes regarding NAND boot errata
imx: ventana: base SPL MMDC calibration on width and size not board
imx: ventana: add GW5520 support
imx: ventana: added cputype env var
pci: add support for board_pci_fixup_dev function
imx: ventana: add pci fixup for PLX PEX860x switch GPIO

Ye.Li (4):
iMX6: Disable the L2 before chaning the PL310 latency
imximage: Fix imximage IVT bug for EIM-NOR boot
imx: mx6q/dlarm2: Change to use generic board
imx: mx6slevk: Change to use generic board

 arch/arm/Kconfig                            |   4 +
 arch/arm/cpu/armv7/mx6/clock.c              | 107 +++++-
 arch/arm/cpu/armv7/mx6/ddr.c                | 277 ++++++++--------
 arch/arm/cpu/armv7/mx6/soc.c                |  11 +-
 arch/arm/dts/Makefile                       |   1 -
 arch/arm/dts/imx6q-sabreauto.dts            |  13 -
 arch/arm/include/asm/arch-mx6/clock.h       |   5 +
 arch/arm/include/asm/arch-mx6/imx-regs.h    |  13 +
 arch/arm/include/asm/arch-mx6/iomux.h       |   9 +
 arch/arm/include/asm/arch-mx6/sys_proto.h   |   5 +-
 arch/arm/include/asm/imx-common/mxc_i2c.h   |  33 ++
 board/compulab/cm_fx6/Kconfig               |  23 ++
 board/compulab/cm_fx6/MAINTAINERS           |   6 +
 board/compulab/cm_fx6/Makefile              |  12 +
 board/compulab/cm_fx6/cm_fx6.c              | 483
++++++++++++++++++++++++++++
 board/compulab/cm_fx6/common.c              |  84 +++++
 board/compulab/cm_fx6/common.h              |  37 +++
 board/compulab/cm_fx6/imximage.cfg          |   8 +
 board/compulab/cm_fx6/spl.c                 | 366 +++++++++++++++++++++
 board/compulab/common/eeprom.c              |  13 +-
 board/freescale/mx6sabresd/mx6dlsabresd.cfg | 131 ++++++++
 board/gateworks/gw_ventana/eeprom.c         |   3 +
 board/gateworks/gw_ventana/gsc.c            |   4 +
 board/gateworks/gw_ventana/gw_ventana.c     | 118 ++++++-
 board/gateworks/gw_ventana/gw_ventana_spl.c | 189 ++++++-----
 board/gateworks/gw_ventana/ventana_eeprom.h |   1 +
 configs/cm_fx6_defconfig                    |   4 +
 configs/mx6dlsabresd_defconfig              |   2 +-
 doc/README.imximage                         |   2 +-
 drivers/block/dwc_ahsata.c                  |  17 +
 drivers/net/fec_mxc.c                       |  42 ++-
 drivers/pci/pci.c                           |   4 +
 drivers/pci/pcie_imx.c                      |  40 ++-
 drivers/serial/serial_lpuart.c              |  19 +-
 include/configs/cm_fx6.h                    | 290 +++++++++++++++++
 include/configs/cm_t335.h                   |   1 +
 include/configs/cm_t35.h                    |   1 +
 include/configs/cm_t54.h                    |   1 +
 include/configs/gw_ventana.h                |   1 +
 include/configs/mx6qarm2.h                  |   2 +
 include/configs/mx6qsabreauto.h             |   3 -
 include/configs/mx6slevk.h                  |   2 +
 include/configs/mx6sxsabresd.h              |  10 +
 include/configs/nitrogen6x.h                |   6 +-
 include/pci.h                               |   7 +
 include/sata.h                              |   1 +
 tools/imximage.c                            |   7 +
 tools/imximage.h                            |   2 +-
 48 files changed, 2140 insertions(+), 280 deletions(-)
 delete mode 100644 arch/arm/dts/imx6q-sabreauto.dts
 create mode 100644 board/compulab/cm_fx6/Kconfig
 create mode 100644 board/compulab/cm_fx6/MAINTAINERS
 create mode 100644 board/compulab/cm_fx6/Makefile
 create mode 100644 board/compulab/cm_fx6/cm_fx6.c
 create mode 100644 board/compulab/cm_fx6/common.c
 create mode 100644 board/compulab/cm_fx6/common.h
 create mode 100644 board/compulab/cm_fx6/imximage.cfg
 create mode 100644 board/compulab/cm_fx6/spl.c
 create mode 100644 board/freescale/mx6sabresd/mx6dlsabresd.cfg
 create mode 100644 configs/cm_fx6_defconfig
 create mode 100644 include/configs/cm_fx6.h

Best 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
=====================================================================
#1 lore raw

Hi Stefano,

Quoted 3 lines · Stefano Babic

Hi Albert,

please pull from u-boot-imx, thanks !

Underway.

Note that in the commits that you have added past 4c97... (which I did *not* take in this PR, of course), there is this one:

d6d07a9b... arm: vf610: add NAND support for vf610twr

Which causes a warning when building the boards.cfg file:

WARNING: no status info for 'vf610twr_nand'
WARNING: no maintainers for 'vf610twr_nand'WARNING: no status info for 'vf610twr_nand'

It may require a fix before getting in a PR.

Amicalement,

Signature · 1 line
Albert.
#2 lore raw
Quoted 5 lines · Albert ARIBAUD

Note that in the commits that you have added past 4c97... (which I did *not* take in this PR, of course), there is this one:

d6d07a9b... arm: vf610: add NAND support for vf610twr

Quoted 7 lines

Which causes a warning when building the boards.cfg file:

WARNING: no status info for 'vf610twr_nand'
WARNING: no maintainers for 'vf610twr_nand'WARNING: no status info for 'vf610twr_nand'

It may require a fix before getting in a PR.

Adding Stefan Agner.

#3 lore raw
In reply to Albert ARIBAUD

Hi Albert,

Quoted 5 lines · Albert ARIBAUD

Hi Stefano,

On Fri, 12 Sep 2014 16:03:15 +0200, Stefano Babic <[email protected]> wrote:

Quoted 8 lines
Quoted 3 lines

Hi Albert,

please pull from u-boot-imx, thanks !

Underway.

Note that in the commits that you have added past 4c97... (which I did *not* take in this PR, of course), there is this one:

Thanks - I am merging further patches today.

Quoted 8 lines

d6d07a9b... arm: vf610: add NAND support for vf610twr

Which causes a warning when building the boards.cfg file:

WARNING: no status info for 'vf610twr_nand'
WARNING: no maintainers for 'vf610twr_nand'WARNING: no status info for 'vf610twr_nand'

Right, I have seen the same issue, thanks !

Quoted 2 lines

It may require a fix before getting in a PR.

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
=====================================================================
#4 lore raw
In reply to Stefano Babic

Hi Stefano,

Quoted 35 lines · Stefano Babic

Hi Albert,

please pull from u-boot-imx, thanks !

The board cm_fx6 cannot be built due to a couple of missing patches that are already merged into u-boot-spi. Please ignore this issue, the board will be compiled clean at the next iteration after Jagan's tree will be merged by Tom.

The following changes since commit a6bc0195dba895fa0e9facc718d17eb098695685:

Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
(2014-09-09 09:19:10 +0200)

are available in the git repository at:

git://www.denx.de/git/u-boot-imx.git master

for you to fetch changes up to 4c97f16911e229f6d5bbea5bee52449916e5fa92:

imx: mx6slevk: Change to use generic board (2014-09-11 11:04:26 +0200)

----------------------------------------------------------------
Fabio Estevam (9):
net: fec_mxc: Adjust RX DMA alignment for mx6solox
net: fec_mxc: Poll FEC_TBD_READY after polling TDAR
tools: imximage: Fix the maximum DCD size for mx53/mx6
mx6dlsabresd: Use its own DCD table
mx6qsabreauto: Remove imx6q-sabreauto.dts
mx6: imx-regs: Provide a structure for GPC registers
pcie_imx: Add mx6solox support
mx6sxsabresd: Add PCI support README.imximage: Fix the maximum DCD size

Quoted 7 lines

Guillaume GARDET (1):
imx: nitrogen6x: Replace 'fatload' by 'load' command in env
settings to be filesystem independent

Nikita Kiryanov (16):
mx6: add clock enabling functions
compulab: eeprom: add support for defining eeprom i2c bus

The commit above (52658fda7abc) breaks trimslice build (and later will break cm_fx6 when it is introduced by 0991866cf7, or possibly before that, at f66113c0ef) with the following errors :

| board/compulab/common/eeprom.c:37:24: error: 'CONFIG_SYS_I2C_EEPROM_BUS' undeclared (first use in this function)

| board/compulab/common/eeprom.c:37:24: error: 'CONFIG_SYS_I2C_EEPROM_BUS' undeclared (first use in this function) | board/compulab/common/eeprom.c:37:24: note: each undeclared identifier is reported only once for each function it appears in

(The repeat is certainly due to the same source file being built for SPL then for U-Boot. Why the note is emitted only in one intance and not the other is waaaaay beyond me.)

Quoted 105 lines

sata: dwc_ahsata: implement sata_port_status
i2c: imx: add macros to setup pads for multiple SoC types
arm: mx6: ddr: cleanup
arm: mx6: ddr: do not write into reserved bit
arm: mx6: ddr: configure MMDC for slow_pd
arm: mx6: ddr: fix cs0_end calculation
arm: mx6: add get_cpu_type()
arm: mx6: add support for Compulab cm-fx6 CoM
arm: mx6: cm_fx6: add nand support
arm: mx6: cm_fx6: add ethernet support
arm: mx6: cm_fx6: add usb support
arm: mx6: cm_fx6: add i2c support
arm: mx6: cm_fx6: use eeprom
arm: mx6: cm_fx6: add sata support

Nikolay Dimitrov (1):
mx6: Fix ECSPI typo in soc_boot_modes

Stefan Agner (2):
arm: vf610: lpuart: fix status register handling
arm: vf610: lpuart: disable FIFO on initializaton

Stefano Babic (1):
imx: Fix build of mx6sxsabresd

Thierry Reding (1):
imx: ventana: Avoid undefined behaviour

Tim Harvey (6):
imx: ventana: updated notes regarding NAND boot errata
imx: ventana: base SPL MMDC calibration on width and size not board
imx: ventana: add GW5520 support
imx: ventana: added cputype env var
pci: add support for board_pci_fixup_dev function
imx: ventana: add pci fixup for PLX PEX860x switch GPIO

Ye.Li (4):
iMX6: Disable the L2 before chaning the PL310 latency
imximage: Fix imximage IVT bug for EIM-NOR boot
imx: mx6q/dlarm2: Change to use generic board
imx: mx6slevk: Change to use generic board

 arch/arm/Kconfig                            |   4 +
 arch/arm/cpu/armv7/mx6/clock.c              | 107 +++++-
 arch/arm/cpu/armv7/mx6/ddr.c                | 277 ++++++++--------
 arch/arm/cpu/armv7/mx6/soc.c                |  11 +-
 arch/arm/dts/Makefile                       |   1 -
 arch/arm/dts/imx6q-sabreauto.dts            |  13 -
 arch/arm/include/asm/arch-mx6/clock.h       |   5 +
 arch/arm/include/asm/arch-mx6/imx-regs.h    |  13 +
 arch/arm/include/asm/arch-mx6/iomux.h       |   9 +
 arch/arm/include/asm/arch-mx6/sys_proto.h   |   5 +-
 arch/arm/include/asm/imx-common/mxc_i2c.h   |  33 ++
 board/compulab/cm_fx6/Kconfig               |  23 ++
 board/compulab/cm_fx6/MAINTAINERS           |   6 +
 board/compulab/cm_fx6/Makefile              |  12 +
 board/compulab/cm_fx6/cm_fx6.c              | 483
++++++++++++++++++++++++++++
 board/compulab/cm_fx6/common.c              |  84 +++++
 board/compulab/cm_fx6/common.h              |  37 +++
 board/compulab/cm_fx6/imximage.cfg          |   8 +
 board/compulab/cm_fx6/spl.c                 | 366 +++++++++++++++++++++
 board/compulab/common/eeprom.c              |  13 +-
 board/freescale/mx6sabresd/mx6dlsabresd.cfg | 131 ++++++++
 board/gateworks/gw_ventana/eeprom.c         |   3 +
 board/gateworks/gw_ventana/gsc.c            |   4 +
 board/gateworks/gw_ventana/gw_ventana.c     | 118 ++++++-
 board/gateworks/gw_ventana/gw_ventana_spl.c | 189 ++++++-----
 board/gateworks/gw_ventana/ventana_eeprom.h |   1 +
 configs/cm_fx6_defconfig                    |   4 +
 configs/mx6dlsabresd_defconfig              |   2 +-
 doc/README.imximage                         |   2 +-
 drivers/block/dwc_ahsata.c                  |  17 +
 drivers/net/fec_mxc.c                       |  42 ++-
 drivers/pci/pci.c                           |   4 +
 drivers/pci/pcie_imx.c                      |  40 ++-
 drivers/serial/serial_lpuart.c              |  19 +-
 include/configs/cm_fx6.h                    | 290 +++++++++++++++++
 include/configs/cm_t335.h                   |   1 +
 include/configs/cm_t35.h                    |   1 +
 include/configs/cm_t54.h                    |   1 +
 include/configs/gw_ventana.h                |   1 +
 include/configs/mx6qarm2.h                  |   2 +
 include/configs/mx6qsabreauto.h             |   3 -
 include/configs/mx6slevk.h                  |   2 +
 include/configs/mx6sxsabresd.h              |  10 +
 include/configs/nitrogen6x.h                |   6 +-
 include/pci.h                               |   7 +
 include/sata.h                              |   1 +
 tools/imximage.c                            |   7 +
 tools/imximage.h                            |   2 +-
 48 files changed, 2140 insertions(+), 280 deletions(-)
 delete mode 100644 arch/arm/dts/imx6q-sabreauto.dts
 create mode 100644 board/compulab/cm_fx6/Kconfig
 create mode 100644 board/compulab/cm_fx6/MAINTAINERS
 create mode 100644 board/compulab/cm_fx6/Makefile
 create mode 100644 board/compulab/cm_fx6/cm_fx6.c
 create mode 100644 board/compulab/cm_fx6/common.c
 create mode 100644 board/compulab/cm_fx6/common.h
 create mode 100644 board/compulab/cm_fx6/imximage.cfg
 create mode 100644 board/compulab/cm_fx6/spl.c
 create mode 100644 board/freescale/mx6sabresd/mx6dlsabresd.cfg
 create mode 100644 configs/cm_fx6_defconfig
 create mode 100644 include/configs/cm_fx6.h
Quoted 2 lines

Best regards,
Stefano

Amicalement,

Signature · 1 line
Albert.
#5 lore raw

Hi Albert,

Quoted 44 lines · Albert ARIBAUD

Hi Stefano,

Quoted 39 lines · Stefano Babic

Hi Albert,

please pull from u-boot-imx, thanks !

The board cm_fx6 cannot be built due to a couple of missing patches that are already merged into u-boot-spi. Please ignore this issue, the board will be compiled clean at the next iteration after Jagan's tree will be merged by Tom.

The following changes since commit a6bc0195dba895fa0e9facc718d17eb098695685:

Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
(2014-09-09 09:19:10 +0200)

are available in the git repository at:

git://www.denx.de/git/u-boot-imx.git master

for you to fetch changes up to 4c97f16911e229f6d5bbea5bee52449916e5fa92:

imx: mx6slevk: Change to use generic board (2014-09-11 11:04:26 +0200)

----------------------------------------------------------------
Fabio Estevam (9):
net: fec_mxc: Adjust RX DMA alignment for mx6solox
net: fec_mxc: Poll FEC_TBD_READY after polling TDAR
tools: imximage: Fix the maximum DCD size for mx53/mx6
mx6dlsabresd: Use its own DCD table
mx6qsabreauto: Remove imx6q-sabreauto.dts
mx6: imx-regs: Provide a structure for GPC registers
pcie_imx: Add mx6solox support
mx6sxsabresd: Add PCI support README.imximage: Fix the maximum DCD size

Guillaume GARDET (1):
imx: nitrogen6x: Replace 'fatload' by 'load' command in env
settings to be filesystem independent

Quoted 8 lines
Quoted 3 lines

Nikita Kiryanov (16):
mx6: add clock enabling functions
compulab: eeprom: add support for defining eeprom i2c bus

The commit above (52658fda7abc) breaks trimslice build (and later will break cm_fx6 when it is introduced by 0991866cf7, or possibly before that, at f66113c0ef) with the following errors :

This is due to the fact that some patches were already merged by Jagan into u-boot-spi and not by me. In fact, I have cherry-picked the relevant patches from Jagan's tree:

a7434e2efa6d514b449c51d57e7af79387761349
[next d709570] spl: replace CONFIG_SPL_SPI_* with CONFIG_SF_DEFAULT_*
Author: Nikita Kiryanov <[email protected]>

fd2dd067fa4f0ea28e80071806850b058dd9555d
[next 8cca248] spi: mxc: fix sf probe when using mxc_spi
Author: Nikita Kiryanov <[email protected]>

 16 files changed, 79 insertions(+), 33 deletions(-)

bdb070e9810017711cff5486eb09c387043be7c6
[next 92c569e] mtd: spi: add support for M25PE16 and M25PX16
Author: Nikita Kiryanov <[email protected]>

 1 file changed, 2 insertions(+)

and then the board is built without any issue.
./MAKEALL cm_fx6
boards.cfg is up to date. Nothing to do.
Building cm_fx6 board...
text data bss dec hex filename
252164 26298 318528 596990 91bfe ./u-boot
27088 2464 112 29664 73e0 ./spl/u-boot-spl

However, patches were already merged. The issue should be solved when u-boot-spi and u-boot-arm will be pulled by Tom. Or do you think we have to do something before ?

Best 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
=====================================================================
#6 lore raw

Hi Stefano,

Quoted 83 lines · Stefano Babic

Hi Albert,

Quoted 44 lines · Albert ARIBAUD

Hi Stefano,

Quoted 39 lines · Stefano Babic

Hi Albert,

please pull from u-boot-imx, thanks !

The board cm_fx6 cannot be built due to a couple of missing patches that are already merged into u-boot-spi. Please ignore this issue, the board will be compiled clean at the next iteration after Jagan's tree will be merged by Tom.

The following changes since commit a6bc0195dba895fa0e9facc718d17eb098695685:

Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
(2014-09-09 09:19:10 +0200)

are available in the git repository at:

git://www.denx.de/git/u-boot-imx.git master

for you to fetch changes up to 4c97f16911e229f6d5bbea5bee52449916e5fa92:

imx: mx6slevk: Change to use generic board (2014-09-11 11:04:26 +0200)

----------------------------------------------------------------
Fabio Estevam (9):
net: fec_mxc: Adjust RX DMA alignment for mx6solox
net: fec_mxc: Poll FEC_TBD_READY after polling TDAR
tools: imximage: Fix the maximum DCD size for mx53/mx6
mx6dlsabresd: Use its own DCD table
mx6qsabreauto: Remove imx6q-sabreauto.dts
mx6: imx-regs: Provide a structure for GPC registers
pcie_imx: Add mx6solox support
mx6sxsabresd: Add PCI support README.imximage: Fix the maximum DCD size

Guillaume GARDET (1):
imx: nitrogen6x: Replace 'fatload' by 'load' command in env
settings to be filesystem independent

Quoted 8 lines
Quoted 3 lines

Nikita Kiryanov (16):
mx6: add clock enabling functions
compulab: eeprom: add support for defining eeprom i2c bus

The commit above (52658fda7abc) breaks trimslice build (and later will break cm_fx6 when it is introduced by 0991866cf7, or possibly before that, at f66113c0ef) with the following errors :

This is due to the fact that some patches were already merged by Jagan into u-boot-spi and not by me. In fact, I have cherry-picked the relevant patches from Jagan's tree:

a7434e2efa6d514b449c51d57e7af79387761349
[next d709570] spl: replace CONFIG_SPL_SPI_* with CONFIG_SF_DEFAULT_*
Author: Nikita Kiryanov <[email protected]>

fd2dd067fa4f0ea28e80071806850b058dd9555d
[next 8cca248] spi: mxc: fix sf probe when using mxc_spi
Author: Nikita Kiryanov <[email protected]>

 16 files changed, 79 insertions(+), 33 deletions(-)

bdb070e9810017711cff5486eb09c387043be7c6
[next 92c569e] mtd: spi: add support for M25PE16 and M25PX16
Author: Nikita Kiryanov <[email protected]>

 1 file changed, 2 insertions(+)

and then the board is built without any issue.
./MAKEALL cm_fx6
boards.cfg is up to date. Nothing to do.
Building cm_fx6 board...
text data bss dec hex filename
252164 26298 318528 596990 91bfe ./u-boot
27088 2464 112 29664 73e0 ./spl/u-boot-spl

Quoted 3 lines

However, patches were already merged. The issue should be solved when u-boot-spi and u-boot-arm will be pulled by Tom. Or do you think we have to do something before ?

There is not much we can do now, so we'll have to make sure u-boot-arm and u-boot-spi et merged into mainline properly.

The problem I see with this type of situation is that non-mainline U-Boot trees (imx, arm, spi...) are supposed to be useable code ontheir own right, and here, imx and arm trees become (slightly) unusable, which prevents things like bisecting in case you end up on a non- buildable commit.

The only solution I can think of -- and it does not solve all cases -- is to never pull in commits or merges from an unrelated tree (e.g., to not pull from spi to arm tree), only from an upstream tree (e.g. pulling from mainline to arm is ok, as is pulling from mainline or arm to imx), and to avoid scattering a patch series over several trees, but rather, apply it to a single tree, with Acks from other custodians and/or maintainers involved.

Quoted 2 lines

Best regards,
Stefano

Amicalement,

Signature · 1 line
Albert.
#7 lore raw
In reply to Albert ARIBAUD

Hi Albert,

Quoted 52 lines · Albert ARIBAUD

Hi Stefano,

Quoted 35 lines · Stefano Babic

Hi Albert,

please pull from u-boot-imx, thanks !

The board cm_fx6 cannot be built due to a couple of missing patches that are already merged into u-boot-spi. Please ignore this issue, the board will be compiled clean at the next iteration after Jagan's tree will be merged by Tom.

The following changes since commit a6bc0195dba895fa0e9facc718d17eb098695685:

Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
(2014-09-09 09:19:10 +0200)

are available in the git repository at:

git://www.denx.de/git/u-boot-imx.git master

for you to fetch changes up to 4c97f16911e229f6d5bbea5bee52449916e5fa92:

imx: mx6slevk: Change to use generic board (2014-09-11 11:04:26 +0200)

----------------------------------------------------------------
Fabio Estevam (9):
net: fec_mxc: Adjust RX DMA alignment for mx6solox
net: fec_mxc: Poll FEC_TBD_READY after polling TDAR
tools: imximage: Fix the maximum DCD size for mx53/mx6
mx6dlsabresd: Use its own DCD table
mx6qsabreauto: Remove imx6q-sabreauto.dts
mx6: imx-regs: Provide a structure for GPC registers
pcie_imx: Add mx6solox support
mx6sxsabresd: Add PCI support README.imximage: Fix the maximum DCD size

Quoted 7 lines

Guillaume GARDET (1):
imx: nitrogen6x: Replace 'fatload' by 'load' command in env
settings to be filesystem independent

Nikita Kiryanov (16):
mx6: add clock enabling functions
compulab: eeprom: add support for defining eeprom i2c bus

The commit above (52658fda7abc) breaks trimslice build (and later will break cm_fx6 when it is introduced by 0991866cf7, or possibly before that, at f66113c0ef) with the following errors :

Quoted 8 lines

| board/compulab/common/eeprom.c:37:24: error: 'CONFIG_SYS_I2C_EEPROM_BUS' undeclared (first use in this function)

| board/compulab/common/eeprom.c:37:24: error: 'CONFIG_SYS_I2C_EEPROM_BUS' undeclared (first use in this function) | board/compulab/common/eeprom.c:37:24: note: each undeclared identifier is reported only once for each function it appears in

(The repeat is certainly due to the same source file being built for SPL then for U-Boot. Why the note is emitted only in one intance and not the other is waaaaay beyond me.)

cm_fx6 will build correctly with all the patches from the series applied. As for Trimslice, this is something I missed because I know it doesn't use the eeprom code, but after commit 39338a30fab2ce7d80dfe0d457071573727f499f it is built anyway.

I think a follow up patch would be the easiest way to address this. What do you think?

Quoted 111 lines
Quoted 106 lines

sata: dwc_ahsata: implement sata_port_status
i2c: imx: add macros to setup pads for multiple SoC types
arm: mx6: ddr: cleanup
arm: mx6: ddr: do not write into reserved bit
arm: mx6: ddr: configure MMDC for slow_pd
arm: mx6: ddr: fix cs0_end calculation
arm: mx6: add get_cpu_type()
arm: mx6: add support for Compulab cm-fx6 CoM
arm: mx6: cm_fx6: add nand support
arm: mx6: cm_fx6: add ethernet support
arm: mx6: cm_fx6: add usb support
arm: mx6: cm_fx6: add i2c support
arm: mx6: cm_fx6: use eeprom
arm: mx6: cm_fx6: add sata support

Nikolay Dimitrov (1):
mx6: Fix ECSPI typo in soc_boot_modes

Stefan Agner (2):
arm: vf610: lpuart: fix status register handling
arm: vf610: lpuart: disable FIFO on initializaton

Stefano Babic (1):
imx: Fix build of mx6sxsabresd

Thierry Reding (1):
imx: ventana: Avoid undefined behaviour

Tim Harvey (6):
imx: ventana: updated notes regarding NAND boot errata
imx: ventana: base SPL MMDC calibration on width and size not board
imx: ventana: add GW5520 support
imx: ventana: added cputype env var
pci: add support for board_pci_fixup_dev function
imx: ventana: add pci fixup for PLX PEX860x switch GPIO

Ye.Li (4):
iMX6: Disable the L2 before chaning the PL310 latency
imximage: Fix imximage IVT bug for EIM-NOR boot
imx: mx6q/dlarm2: Change to use generic board
imx: mx6slevk: Change to use generic board

  arch/arm/Kconfig                            |   4 +
  arch/arm/cpu/armv7/mx6/clock.c              | 107 +++++-
  arch/arm/cpu/armv7/mx6/ddr.c                | 277 ++++++++--------
  arch/arm/cpu/armv7/mx6/soc.c                |  11 +-
  arch/arm/dts/Makefile                       |   1 -
  arch/arm/dts/imx6q-sabreauto.dts            |  13 -
  arch/arm/include/asm/arch-mx6/clock.h       |   5 +
  arch/arm/include/asm/arch-mx6/imx-regs.h    |  13 +
  arch/arm/include/asm/arch-mx6/iomux.h       |   9 +
  arch/arm/include/asm/arch-mx6/sys_proto.h   |   5 +-
  arch/arm/include/asm/imx-common/mxc_i2c.h   |  33 ++
  board/compulab/cm_fx6/Kconfig               |  23 ++
  board/compulab/cm_fx6/MAINTAINERS           |   6 +
  board/compulab/cm_fx6/Makefile              |  12 +
  board/compulab/cm_fx6/cm_fx6.c              | 483
++++++++++++++++++++++++++++
  board/compulab/cm_fx6/common.c              |  84 +++++
  board/compulab/cm_fx6/common.h              |  37 +++
  board/compulab/cm_fx6/imximage.cfg          |   8 +
  board/compulab/cm_fx6/spl.c                 | 366 +++++++++++++++++++++
  board/compulab/common/eeprom.c              |  13 +-
  board/freescale/mx6sabresd/mx6dlsabresd.cfg | 131 ++++++++
  board/gateworks/gw_ventana/eeprom.c         |   3 +
  board/gateworks/gw_ventana/gsc.c            |   4 +
  board/gateworks/gw_ventana/gw_ventana.c     | 118 ++++++-
  board/gateworks/gw_ventana/gw_ventana_spl.c | 189 ++++++-----
  board/gateworks/gw_ventana/ventana_eeprom.h |   1 +
  configs/cm_fx6_defconfig                    |   4 +
  configs/mx6dlsabresd_defconfig              |   2 +-
  doc/README.imximage                         |   2 +-
  drivers/block/dwc_ahsata.c                  |  17 +
  drivers/net/fec_mxc.c                       |  42 ++-
  drivers/pci/pci.c                           |   4 +
  drivers/pci/pcie_imx.c                      |  40 ++-
  drivers/serial/serial_lpuart.c              |  19 +-
  include/configs/cm_fx6.h                    | 290 +++++++++++++++++
  include/configs/cm_t335.h                   |   1 +
  include/configs/cm_t35.h                    |   1 +
  include/configs/cm_t54.h                    |   1 +
  include/configs/gw_ventana.h                |   1 +
  include/configs/mx6qarm2.h                  |   2 +
  include/configs/mx6qsabreauto.h             |   3 -
  include/configs/mx6slevk.h                  |   2 +
  include/configs/mx6sxsabresd.h              |  10 +
  include/configs/nitrogen6x.h                |   6 +-
  include/pci.h                               |   7 +
  include/sata.h                              |   1 +
  tools/imximage.c                            |   7 +
  tools/imximage.h                            |   2 +-
  48 files changed, 2140 insertions(+), 280 deletions(-)

delete mode 100644 arch/arm/dts/imx6q-sabreauto.dts create mode 100644 board/compulab/cm_fx6/Kconfig create mode 100644 board/compulab/cm_fx6/MAINTAINERS create mode 100644 board/compulab/cm_fx6/Makefile create mode 100644 board/compulab/cm_fx6/cm_fx6.c create mode 100644 board/compulab/cm_fx6/common.c create mode 100644 board/compulab/cm_fx6/common.h create mode 100644 board/compulab/cm_fx6/imximage.cfg create mode 100644 board/compulab/cm_fx6/spl.c create mode 100644 board/freescale/mx6sabresd/mx6dlsabresd.cfg create mode 100644 configs/cm_fx6_defconfig
create mode 100644 include/configs/cm_fx6.h

Quoted 2 lines

Best regards,
Stefano

Amicalement,

Signature · 2 lines
Regards,
Nikita Kiryanov
#8 lore raw
In reply to Stefano Babic

Hi Stefano,

Quoted 147 lines · Stefano Babic

Hi Albert,

please pull from u-boot-imx, thanks !

The board cm_fx6 cannot be built due to a couple of missing patches that are already merged into u-boot-spi. Please ignore this issue, the board will be compiled clean at the next iteration after Jagan's tree will be merged by Tom.

The following changes since commit a6bc0195dba895fa0e9facc718d17eb098695685:

Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
(2014-09-09 09:19:10 +0200)

are available in the git repository at:

git://www.denx.de/git/u-boot-imx.git master

for you to fetch changes up to 4c97f16911e229f6d5bbea5bee52449916e5fa92:

imx: mx6slevk: Change to use generic board (2014-09-11 11:04:26 +0200)

----------------------------------------------------------------
Fabio Estevam (9):
net: fec_mxc: Adjust RX DMA alignment for mx6solox
net: fec_mxc: Poll FEC_TBD_READY after polling TDAR
tools: imximage: Fix the maximum DCD size for mx53/mx6
mx6dlsabresd: Use its own DCD table
mx6qsabreauto: Remove imx6q-sabreauto.dts
mx6: imx-regs: Provide a structure for GPC registers
pcie_imx: Add mx6solox support
mx6sxsabresd: Add PCI support README.imximage: Fix the maximum DCD size

Guillaume GARDET (1):
imx: nitrogen6x: Replace 'fatload' by 'load' command in env
settings to be filesystem independent

Nikita Kiryanov (16):
mx6: add clock enabling functions
compulab: eeprom: add support for defining eeprom i2c bus
sata: dwc_ahsata: implement sata_port_status
i2c: imx: add macros to setup pads for multiple SoC types
arm: mx6: ddr: cleanup
arm: mx6: ddr: do not write into reserved bit
arm: mx6: ddr: configure MMDC for slow_pd
arm: mx6: ddr: fix cs0_end calculation
arm: mx6: add get_cpu_type()
arm: mx6: add support for Compulab cm-fx6 CoM
arm: mx6: cm_fx6: add nand support
arm: mx6: cm_fx6: add ethernet support
arm: mx6: cm_fx6: add usb support
arm: mx6: cm_fx6: add i2c support
arm: mx6: cm_fx6: use eeprom
arm: mx6: cm_fx6: add sata support

Nikolay Dimitrov (1):
mx6: Fix ECSPI typo in soc_boot_modes

Stefan Agner (2):
arm: vf610: lpuart: fix status register handling
arm: vf610: lpuart: disable FIFO on initializaton

Stefano Babic (1):
imx: Fix build of mx6sxsabresd

Thierry Reding (1):
imx: ventana: Avoid undefined behaviour

Tim Harvey (6):
imx: ventana: updated notes regarding NAND boot errata
imx: ventana: base SPL MMDC calibration on width and size not board
imx: ventana: add GW5520 support
imx: ventana: added cputype env var
pci: add support for board_pci_fixup_dev function
imx: ventana: add pci fixup for PLX PEX860x switch GPIO

Ye.Li (4):
iMX6: Disable the L2 before chaning the PL310 latency
imximage: Fix imximage IVT bug for EIM-NOR boot
imx: mx6q/dlarm2: Change to use generic board
imx: mx6slevk: Change to use generic board

 arch/arm/Kconfig                            |   4 +
 arch/arm/cpu/armv7/mx6/clock.c              | 107 +++++-
 arch/arm/cpu/armv7/mx6/ddr.c                | 277 ++++++++--------
 arch/arm/cpu/armv7/mx6/soc.c                |  11 +-
 arch/arm/dts/Makefile                       |   1 -
 arch/arm/dts/imx6q-sabreauto.dts            |  13 -
 arch/arm/include/asm/arch-mx6/clock.h       |   5 +
 arch/arm/include/asm/arch-mx6/imx-regs.h    |  13 +
 arch/arm/include/asm/arch-mx6/iomux.h       |   9 +
 arch/arm/include/asm/arch-mx6/sys_proto.h   |   5 +-
 arch/arm/include/asm/imx-common/mxc_i2c.h   |  33 ++
 board/compulab/cm_fx6/Kconfig               |  23 ++
 board/compulab/cm_fx6/MAINTAINERS           |   6 +
 board/compulab/cm_fx6/Makefile              |  12 +
 board/compulab/cm_fx6/cm_fx6.c              | 483
++++++++++++++++++++++++++++
 board/compulab/cm_fx6/common.c              |  84 +++++
 board/compulab/cm_fx6/common.h              |  37 +++
 board/compulab/cm_fx6/imximage.cfg          |   8 +
 board/compulab/cm_fx6/spl.c                 | 366 +++++++++++++++++++++
 board/compulab/common/eeprom.c              |  13 +-
 board/freescale/mx6sabresd/mx6dlsabresd.cfg | 131 ++++++++
 board/gateworks/gw_ventana/eeprom.c         |   3 +
 board/gateworks/gw_ventana/gsc.c            |   4 +
 board/gateworks/gw_ventana/gw_ventana.c     | 118 ++++++-
 board/gateworks/gw_ventana/gw_ventana_spl.c | 189 ++++++-----
 board/gateworks/gw_ventana/ventana_eeprom.h |   1 +
 configs/cm_fx6_defconfig                    |   4 +
 configs/mx6dlsabresd_defconfig              |   2 +-
 doc/README.imximage                         |   2 +-
 drivers/block/dwc_ahsata.c                  |  17 +
 drivers/net/fec_mxc.c                       |  42 ++-
 drivers/pci/pci.c                           |   4 +
 drivers/pci/pcie_imx.c                      |  40 ++-
 drivers/serial/serial_lpuart.c              |  19 +-
 include/configs/cm_fx6.h                    | 290 +++++++++++++++++
 include/configs/cm_t335.h                   |   1 +
 include/configs/cm_t35.h                    |   1 +
 include/configs/cm_t54.h                    |   1 +
 include/configs/gw_ventana.h                |   1 +
 include/configs/mx6qarm2.h                  |   2 +
 include/configs/mx6qsabreauto.h             |   3 -
 include/configs/mx6slevk.h                  |   2 +
 include/configs/mx6sxsabresd.h              |  10 +
 include/configs/nitrogen6x.h                |   6 +-
 include/pci.h                               |   7 +
 include/sata.h                              |   1 +
 tools/imximage.c                            |   7 +
 tools/imximage.h                            |   2 +-
 48 files changed, 2140 insertions(+), 280 deletions(-)
 delete mode 100644 arch/arm/dts/imx6q-sabreauto.dts
 create mode 100644 board/compulab/cm_fx6/Kconfig
 create mode 100644 board/compulab/cm_fx6/MAINTAINERS
 create mode 100644 board/compulab/cm_fx6/Makefile
 create mode 100644 board/compulab/cm_fx6/cm_fx6.c
 create mode 100644 board/compulab/cm_fx6/common.c
 create mode 100644 board/compulab/cm_fx6/common.h
 create mode 100644 board/compulab/cm_fx6/imximage.cfg
 create mode 100644 board/compulab/cm_fx6/spl.c
 create mode 100644 board/freescale/mx6sabresd/mx6dlsabresd.cfg
 create mode 100644 configs/cm_fx6_defconfig
 create mode 100644 include/configs/cm_fx6.h
Quoted 3 lines

Best regards,
Stefano

Applied to u-boot-arm/master [1], thanks!

[1] with two boards (trimslice and cm_fx6)temporarily failing to build until spi tree gets pulled)

Amicalement,

Signature · 1 line
Albert.