mbox

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

Message ID 4DC7D4E4.4040001@denx.de
State Accepted
Headers show

Pull-request

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

Message

Stefano Babic May 9, 2011, 11:49 a.m. UTC 
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

Comments

Albert ARIBAUD May 10, 2011, 9:55 p.m. UTC | #1 
Le 09/05/2011 13:49, Stefano Babic a écrit :
> 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

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,
Stefano Babic May 11, 2011, 5:50 a.m. UTC | #2 
On 05/10/2011 11:55 PM, Albert ARIBAUD wrote:
> Le 09/05/2011 13:49, Stefano Babic a écrit :
>> Hi Albert,
>>

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
> 
> 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
Albert ARIBAUD May 11, 2011, 8:56 p.m. UTC | #3 
Hi Stefano,

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

> 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.

> Best regards,
> Stefano

Amicalement,
Albert ARIBAUD May 11, 2011, 8:58 p.m. UTC | #4 
Hi Stefano,

Le 09/05/2011 13:49, Stefano Babic a écrit :
> 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(-)

Applied, thanks.

> Best regards,
> Stefano Babic

Amicalement,