Skip to contentSkip to conversation

Pull request: u-boot-imx

GIT PULL Stefano Babic 2 participants 6 messages Mar 8, 2012 – Mar 27, 2012

lore
Share & tools
lore

Stefano Babic

author
#0 lore raw

Hi Albert,

please pull from u-boot-imx, thanks.

The following changes since commit 32ec258f829808dd7cf74fd83ba999fdaaeab715:

IXP: Fix GPIO_INT_ACT_LOW_SET() (2012-03-08 08:11:45 +0100)

are available in the git repository at:
git://www.denx.de/git/u-boot-imx.git master

Dirk Behme (1):
imximage: Remove overwriting of flash_offset

Eric Nelson (2):
i.MX6: mx6qsabrelite: add ext2 support
mx6q: mx6qsabrelite: setup_spi() should be called in board_init to
allow use for environment

Fabio Estevam (5):
mx51evk: Fix CONFIG_SYS_MEMTEST_END
mx53evk: Fix CONFIG_SYS_MEMTEST_END
mx53smd: Fix CONFIG_SYS_MEMTEST_END
efikamx: Fix CONFIG_SYS_MEMTEST_END
mx31pdk: Fix CONFIG_SYS_MEMTEST_END

Helmut Raiger (1):
mx31: add "ARM11P power gating" to get_reset_cause

 arch/arm/cpu/arm1136/mx31/generic.c           |    2 ++
 board/freescale/mx6qsabrelite/mx6qsabrelite.c |    8 ++++----
 include/configs/efikamx.h                     |    2 +-
 include/configs/mx31pdk.h                     |    2 +-
 include/configs/mx51evk.h                     |    2 +-
 include/configs/mx53evk.h                     |    2 +-
 include/configs/mx53smd.h                     |    2 +-
 include/configs/mx6qsabrelite.h               |    1 +
 tools/imximage.c                              |   18 ++++++++++++++----
 tools/imximage.h                              |    1 +
 10 files changed, 27 insertions(+), 13 deletions(-)
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-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================
#1 lore raw

Hi Stefano,

Le 08/03/2012 08:52, Stefano Babic a ?crit :

Quoted 29 lines

Hi Albert,

please pull from u-boot-imx, thanks.

The following changes since commit 32ec258f829808dd7cf74fd83ba999fdaaeab715:

   IXP: Fix GPIO_INT_ACT_LOW_SET() (2012-03-08 08:11:45 +0100)

are available in the git repository at:
git://www.denx.de/git/u-boot-imx.git master

Dirk Behme (1):
imximage: Remove overwriting of flash_offset

Eric Nelson (2):
i.MX6: mx6qsabrelite: add ext2 support
mx6q: mx6qsabrelite: setup_spi() should be called in board_init to
allow use for environment

Fabio Estevam (5):
mx51evk: Fix CONFIG_SYS_MEMTEST_END
mx53evk: Fix CONFIG_SYS_MEMTEST_END
mx53smd: Fix CONFIG_SYS_MEMTEST_END
efikamx: Fix CONFIG_SYS_MEMTEST_END
mx31pdk: Fix CONFIG_SYS_MEMTEST_END

Helmut Raiger (1):
mx31: add "ARM11P power gating" to get_reset_cause

Quoted 11 lines
  arch/arm/cpu/arm1136/mx31/generic.c           |    2 ++
  board/freescale/mx6qsabrelite/mx6qsabrelite.c |    8 ++++----
  include/configs/efikamx.h                     |    2 +-
  include/configs/mx31pdk.h                     |    2 +-
  include/configs/mx51evk.h                     |    2 +-
  include/configs/mx53evk.h                     |    2 +-
  include/configs/mx53smd.h                     |    2 +-
  include/configs/mx6qsabrelite.h               |    1 +
  tools/imximage.c                              |   18 ++++++++++++++----
  tools/imximage.h                              |    1 +
  10 files changed, 27 insertions(+), 13 deletions(-)

Applied to u-boot-arm/master, thanks.

Amicalement,

Signature · 1 line
Albert.
#2 lore raw

Le 26/03/2012 22:45, Albert ARIBAUD a ?crit :

Quoted 45 lines

Hi Stefano,

Le 08/03/2012 08:52, Stefano Babic a ?crit :

Quoted 32 lines

Hi Albert,

please pull from u-boot-imx, thanks.

The following changes since commit
32ec258f829808dd7cf74fd83ba999fdaaeab715:

IXP: Fix GPIO_INT_ACT_LOW_SET() (2012-03-08 08:11:45 +0100)

are available in the git repository at:
git://www.denx.de/git/u-boot-imx.git master

Dirk Behme (1):
imximage: Remove overwriting of flash_offset

Eric Nelson (2):
i.MX6: mx6qsabrelite: add ext2 support
mx6q: mx6qsabrelite: setup_spi() should be called in board_init to allow use for environment

Fabio Estevam (5):
mx51evk: Fix CONFIG_SYS_MEMTEST_END
mx53evk: Fix CONFIG_SYS_MEMTEST_END
mx53smd: Fix CONFIG_SYS_MEMTEST_END
efikamx: Fix CONFIG_SYS_MEMTEST_END
mx31pdk: Fix CONFIG_SYS_MEMTEST_END

Helmut Raiger (1):
mx31: add "ARM11P power gating" to get_reset_cause

arch/arm/cpu/arm1136/mx31/generic.c | 2 ++ board/freescale/mx6qsabrelite/mx6qsabrelite.c | 8 ++++----

Quoted 9 lines
include/configs/efikamx.h | 2 +-
include/configs/mx31pdk.h | 2 +-
include/configs/mx51evk.h | 2 +-
include/configs/mx53evk.h | 2 +-
include/configs/mx53smd.h | 2 +-
include/configs/mx6qsabrelite.h | 1 +
tools/imximage.c | 18 ++++++++++++++----
tools/imximage.h | 1 +
10 files changed, 27 insertions(+), 13 deletions(-)
Quoted 3 lines

Applied to u-boot-arm/master, thanks.

Amicalement,

Correction: I seem to have misapplied this and the TI tree, so I rolled back my changes...

The imx master branch has moved and no longer starts with the commits above from the base above. Stefano, can you rebase on u-boot-arm and re-issue an up-to-date request?

Amicalement,

Signature · 1 line
Albert.
author
#3 lore raw
Quoted 48 lines · Albert ARIBAUD

Le 26/03/2012 22:45, Albert ARIBAUD a ?crit :

Quoted 47 lines

Hi Stefano,

Le 08/03/2012 08:52, Stefano Babic a ?crit :

Quoted 32 lines

Hi Albert,

please pull from u-boot-imx, thanks.

The following changes since commit
32ec258f829808dd7cf74fd83ba999fdaaeab715:

IXP: Fix GPIO_INT_ACT_LOW_SET() (2012-03-08 08:11:45 +0100)

are available in the git repository at:
git://www.denx.de/git/u-boot-imx.git master

Dirk Behme (1):
imximage: Remove overwriting of flash_offset

Eric Nelson (2):
i.MX6: mx6qsabrelite: add ext2 support
mx6q: mx6qsabrelite: setup_spi() should be called in board_init to allow use for environment

Fabio Estevam (5):
mx51evk: Fix CONFIG_SYS_MEMTEST_END
mx53evk: Fix CONFIG_SYS_MEMTEST_END
mx53smd: Fix CONFIG_SYS_MEMTEST_END
efikamx: Fix CONFIG_SYS_MEMTEST_END
mx31pdk: Fix CONFIG_SYS_MEMTEST_END

Helmut Raiger (1):
mx31: add "ARM11P power gating" to get_reset_cause

arch/arm/cpu/arm1136/mx31/generic.c | 2 ++ board/freescale/mx6qsabrelite/mx6qsabrelite.c | 8 ++++----

Quoted 9 lines
include/configs/efikamx.h | 2 +-
include/configs/mx31pdk.h | 2 +-
include/configs/mx51evk.h | 2 +-
include/configs/mx53evk.h | 2 +-
include/configs/mx53smd.h | 2 +-
include/configs/mx6qsabrelite.h | 1 +
tools/imximage.c | 18 ++++++++++++++----
tools/imximage.h | 1 +
10 files changed, 27 insertions(+), 13 deletions(-)

Applied to u-boot-arm/master, thanks.

Quoted 8 lines
Quoted 1 line

Amicalement,

Correction: I seem to have misapplied this and the TI tree, so I rolled back my changes...

The imx master branch has moved and no longer starts with the commits above from the base above. Stefano, can you rebase on u-boot-arm and re-issue an up-to-date request?

Yes, you're right- I had to rebase on u-boot.git because I needed some fixes. I will resend my pull request.

Stefano

Quoted 2 lines

Amicalement,

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
=====================================================================
author
#4 lore raw

[U-Boot] [GIT PULL] Update - Pull request: u-boot-imx

In reply to Albert ARIBAUD

Hi Albert,

please pull from u-boot-imx (rebased on current u-boot-arm).

The following changes since commit cd207cde948ecf9ff50a0fa1ae2650f65579c9c9:

IXP: Fix GPIO_INT_ACT_LOW_SET() (2012-03-26 23:09:26 +0200)

are available in the git repository at:
git://www.denx.de/git/u-boot-imx.git master

Dirk Behme (1):
imximage: Remove overwriting of flash_offset

Eric Nelson (4):
i.MX6: mx6qsabrelite: add ext2 support
mx6q: mx6qsabrelite: setup_spi() should be called in board_init to
allow use for environment
i.MX6: mx6q_sabrelite: add CONFIG_REVISION_TAG
i.MX6: mx6qsabrelite: add MACH_TYPE_MX6Q_SABRELITE

Fabio Estevam (15):
mx51evk: Fix CONFIG_SYS_MEMTEST_END
mx53evk: Fix CONFIG_SYS_MEMTEST_END
mx53smd: Fix CONFIG_SYS_MEMTEST_END
efikamx: Fix CONFIG_SYS_MEMTEST_END
mx31pdk: Fix CONFIG_SYS_MEMTEST_END
mx6: Fix reset cause for Power On Reset case
mx6: Remove duplicate definition of ANATOP_BASE_ADDR
pmic_i2c: Return error in case of invalid pmic_i2c_tx_num
mxs_spi: Return proper timeout error
mx6: Read silicon revision from register
USB: ehci-mx6: Add proper IO accessors
mx28evk: Provide default values for SPI bus and chip select
configs: imx: Use CONFIG_SF_DEFAULT_CS
mx53: Make PLL2 to be the parent of UART clock
mx53ard: Initialize return code with error

Helmut Raiger (1):
mx31: add "ARM11P power gating" to get_reset_cause

Marek Vasut (3):
i.MX28: Enable additional DRAM address bits i.MX28: Make the stabilization delays shorter i.MX28: Drop __naked function from spl_mem_init

 arch/arm/cpu/arm1136/mx31/generic.c           |    2 +
 arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c    |   12 +--
 arch/arm/cpu/arm926ejs/mx28/spl_power_init.c  |    8 +-
 arch/arm/cpu/armv7/imx-common/cpu.c           |   25 ++++-
 arch/arm/cpu/armv7/mx5/lowlevel_init.S        |   20 +++-
 arch/arm/cpu/armv7/mx6/soc.c                  |    8 ++-
 arch/arm/include/asm/arch-mx6/imx-regs.h      |  143
++++++++++++++++++++++++-
 board/freescale/mx53ard/mx53ard.c             |    2 +-
 board/freescale/mx6qsabrelite/mx6qsabrelite.c |   13 ++-
 drivers/misc/pmic_i2c.c                       |    6 +
 drivers/spi/mxs_spi.c                         |    6 +-
 drivers/usb/host/ehci-mx6.c                   |   13 +--
 include/configs/efikamx.h                     |    4 +-
 include/configs/m28evk.h                      |    2 +-
 include/configs/mx28evk.h                     |    2 +
 include/configs/mx31pdk.h                     |    2 +-
 include/configs/mx51evk.h                     |    2 +-
 include/configs/mx53evk.h                     |    2 +-
 include/configs/mx53smd.h                     |    2 +-
 include/configs/mx6qsabrelite.h               |    4 +
 include/configs/vision2.h                     |    2 +-
 tools/imximage.c                              |   18 +++-
 tools/imximage.h                              |    1 +
 23 files changed, 251 insertions(+), 48 deletions(-)
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
=====================================================================
#5 lore raw

[U-Boot] [GIT PULL] Update - Pull request: u-boot-imx

Hi Stefano,

Le 27/03/2012 09:46, Stefano Babic a ?crit :

Quoted 63 lines

Hi Albert,

please pull from u-boot-imx (rebased on current u-boot-arm).

The following changes since commit cd207cde948ecf9ff50a0fa1ae2650f65579c9c9:

   IXP: Fix GPIO_INT_ACT_LOW_SET() (2012-03-26 23:09:26 +0200)

are available in the git repository at:
git://www.denx.de/git/u-boot-imx.git master

Dirk Behme (1):
imximage: Remove overwriting of flash_offset

Eric Nelson (4):
i.MX6: mx6qsabrelite: add ext2 support
mx6q: mx6qsabrelite: setup_spi() should be called in board_init to
allow use for environment
i.MX6: mx6q_sabrelite: add CONFIG_REVISION_TAG
i.MX6: mx6qsabrelite: add MACH_TYPE_MX6Q_SABRELITE

Fabio Estevam (15):
mx51evk: Fix CONFIG_SYS_MEMTEST_END
mx53evk: Fix CONFIG_SYS_MEMTEST_END
mx53smd: Fix CONFIG_SYS_MEMTEST_END
efikamx: Fix CONFIG_SYS_MEMTEST_END
mx31pdk: Fix CONFIG_SYS_MEMTEST_END
mx6: Fix reset cause for Power On Reset case
mx6: Remove duplicate definition of ANATOP_BASE_ADDR
pmic_i2c: Return error in case of invalid pmic_i2c_tx_num
mxs_spi: Return proper timeout error
mx6: Read silicon revision from register
USB: ehci-mx6: Add proper IO accessors
mx28evk: Provide default values for SPI bus and chip select
configs: imx: Use CONFIG_SF_DEFAULT_CS
mx53: Make PLL2 to be the parent of UART clock
mx53ard: Initialize return code with error

Helmut Raiger (1):
mx31: add "ARM11P power gating" to get_reset_cause

Marek Vasut (3):
i.MX28: Enable additional DRAM address bits i.MX28: Make the stabilization delays shorter i.MX28: Drop __naked function from spl_mem_init

  arch/arm/cpu/arm1136/mx31/generic.c           |    2 +
  arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c    |   12 +--
  arch/arm/cpu/arm926ejs/mx28/spl_power_init.c  |    8 +-
  arch/arm/cpu/armv7/imx-common/cpu.c           |   25 ++++-
  arch/arm/cpu/armv7/mx5/lowlevel_init.S        |   20 +++-
  arch/arm/cpu/armv7/mx6/soc.c                  |    8 ++-
  arch/arm/include/asm/arch-mx6/imx-regs.h      |  143
++++++++++++++++++++++++-
  board/freescale/mx53ard/mx53ard.c             |    2 +-
  board/freescale/mx6qsabrelite/mx6qsabrelite.c |   13 ++-
  drivers/misc/pmic_i2c.c                       |    6 +
  drivers/spi/mxs_spi.c                         |    6 +-
  drivers/usb/host/ehci-mx6.c                   |   13 +--
  include/configs/efikamx.h                     |    4 +-
  include/configs/m28evk.h                      |    2 +-
  include/configs/mx28evk.h                     |    2 +
  include/configs/mx31pdk.h                     |    2 +-
Quoted 8 lines
  include/configs/mx51evk.h                     |    2 +-
  include/configs/mx53evk.h                     |    2 +-
  include/configs/mx53smd.h                     |    2 +-
  include/configs/mx6qsabrelite.h               |    4 +
  include/configs/vision2.h                     |    2 +-
  tools/imximage.c                              |   18 +++-
  tools/imximage.h                              |    1 +
  23 files changed, 251 insertions(+), 48 deletions(-)

Applied to u-boot-arm/master, thanks.

Amicalement,

Signature · 1 line
Albert.