Skip to contentSkip to conversation

Pull request: u-boot-imx

GIT PULL Applied Stefano Babic 2 participants 5 messages May 9, 2011 – May 11, 2011

lore
Share & tools
lore

Stefano Babic

author
#0 lore raw

Hi Albert,

please pull from u-boot-imx.

The following changes since commit 96d04c3150ae9284500aef48803d7d132968f2b2:

IDE: fix compiler warnings (2011-04-30 23:29:55 +0200)

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

Fabio Estevam (2):
MX31: mx31pdk: Add watchdog support
gpio: imx: Fix return value on error

Stefano Babic (2):
MX31: removed warning due to missing prototype
MX31: change return value of get_cpu_rev

 arch/arm/cpu/arm1136/mx31/generic.c       |   31
++++++++++++++++------------
 arch/arm/include/asm/arch-mx31/clock.h    |    1 +
 arch/arm/include/asm/arch-mx31/imx-regs.h |    2 +-
 board/freescale/mx31pdk/mx31pdk.c         |   16 +++++++++++++++
 drivers/gpio/mxc_gpio.c                   |    5 ++-
 include/configs/mx31pdk.h                 |    3 ++
 6 files changed, 42 insertions(+), 16 deletions(-)

Best regards,
Stefano Babic

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

Le 09/05/2011 13:49, Stefano Babic a ?crit :

Quoted 11 lines

Hi Albert,

please pull from u-boot-imx.

The following changes since commit 96d04c3150ae9284500aef48803d7d132968f2b2:

   IDE: fix compiler warnings (2011-04-30 23:29:55 +0200)

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

Quoted 7 lines

Fabio Estevam (2):
MX31: mx31pdk: Add watchdog support
gpio: imx: Fix return value on error

Stefano Babic (2):
MX31: removed warning due to missing prototype
MX31: change return value of get_cpu_rev

Hi Stefano,

This is weird: if I 'git fetch' your repo, I don't get a new master branch from it (previous fetch was when you sent out your previous pull request. The master I see from you is at "mx31pdk: Clean up mx31pdk.h file" (97ed77ba9c12158860b6a94caaa60df437588973), which is not in the list above. Can you double-check?

Amicalement,

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

Le 09/05/2011 13:49, Stefano Babic a ?crit :

Quoted 2 lines

Hi Albert,

Hi Albert,

Quoted 18 lines
Quoted 10 lines

please pull from u-boot-imx.

The following changes since commit
96d04c3150ae9284500aef48803d7d132968f2b2:

   IDE: fix compiler warnings (2011-04-30 23:29:55 +0200)

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

Quoted 7 lines

Fabio Estevam (2):
MX31: mx31pdk: Add watchdog support
gpio: imx: Fix return value on error

Stefano Babic (2):
MX31: removed warning due to missing prototype
MX31: change return value of get_cpu_rev

Quoted 7 lines

Hi Stefano,

This is weird: if I 'git fetch' your repo, I don't get a new master branch from it (previous fetch was when you sent out your previous pull request. The master I see from you is at "mx31pdk: Clean up mx31pdk.h file" (97ed77ba9c12158860b6a94caaa60df437588973), which is not in the list above. Can you double-check?

Sorry, my fault. I have already added a further patch to the master branch, instead of using my "next" as I am used to until you merge my master into u-boot-arm. It shoould be OK now.

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-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================
#3 lore raw

Hi Stefano,

Le 11/05/2011 07:50, Stefano Babic a ?crit :

Quoted 3 lines

Sorry, my fault. I have already added a further patch to the master branch, instead of using my "next" as I am used to until you merge my master into u-boot-arm. It shoould be OK now.

It is, thanks.

Quoted 2 lines

Best regards,
Stefano

Amicalement,

Signature · 1 line
Albert.
Applied
#4 lore raw
In reply to Stefano Babic

Hi Stefano,

Le 09/05/2011 13:49, Stefano Babic a ?crit :

Quoted 19 lines

Hi Albert,

please pull from u-boot-imx.

The following changes since commit 96d04c3150ae9284500aef48803d7d132968f2b2:

   IDE: fix compiler warnings (2011-04-30 23:29:55 +0200)

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

Fabio Estevam (2):
MX31: mx31pdk: Add watchdog support
gpio: imx: Fix return value on error

Stefano Babic (2):
MX31: removed warning due to missing prototype
MX31: change return value of get_cpu_rev

Quoted 8 lines
  arch/arm/cpu/arm1136/mx31/generic.c       |   31
++++++++++++++++------------
  arch/arm/include/asm/arch-mx31/clock.h    |    1 +
  arch/arm/include/asm/arch-mx31/imx-regs.h |    2 +-
  board/freescale/mx31pdk/mx31pdk.c         |   16 +++++++++++++++
  drivers/gpio/mxc_gpio.c                   |    5 ++-
  include/configs/mx31pdk.h                 |    3 ++
  6 files changed, 42 insertions(+), 16 deletions(-)

Applied, thanks.

Quoted 2 lines

Best regards,
Stefano Babic

Amicalement,

Signature · 1 line
Albert.