mbox

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

Message ID 4D57AAC4.40007@denx.de
State Accepted
Headers show

Pull-request

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

Message

Stefano Babic Feb. 13, 2011, 9:56 a.m. UTC
Hi Albert,

please pull from u-boot-imx.

The following changes since commit 42d44f631c4e8e5359775bdc098f2fffde4e5c05:

  Prepare v2011.03-rc1 (2011-02-02 22:37:32 +0100)

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

Fabio Estevam (2):
      mx31pdk: Use the new relocation scheme
      mx31pdk: Make the full boot log visible

Loïc Minier (1):
      EfikaMX: switch to MACH_TYPE_MX51_EFIKAMX

 board/efikamx/efikamx.c                     |    2 +-
 board/freescale/mx31pdk/mx31pdk.c           |   17 ++++++-
 include/configs/mx31pdk.h                   |    7 +++
 nand_spl/board/freescale/mx31pdk/u-boot.lds |   59
+++++++++++++++++++++++---
 4 files changed, 74 insertions(+), 11 deletions(-)

Comments

Albert ARIBAUD Feb. 13, 2011, 11:25 a.m. UTC | #1
Le 13/02/2011 10:56, Stefano Babic a écrit :
> Hi Albert,
>
> please pull from u-boot-imx.
>
> The following changes since commit 42d44f631c4e8e5359775bdc098f2fffde4e5c05:
>
>    Prepare v2011.03-rc1 (2011-02-02 22:37:32 +0100)
>
> are available in the git repository at:
>    git://www.denx.de/git/u-boot-imx.git master

Applied, thanks.

Note pushing u-boot-arm/master caused a forced update of the remote 
branch although I had absolutely no error or warning when rebasing onto 
u-boot/master or merging u-boot-imx.

Amicalement,
Albert ARIBAUD Feb. 13, 2011, 11:57 a.m. UTC | #2
Le 13/02/2011 12:25, Albert ARIBAUD a écrit :
> Le 13/02/2011 10:56, Stefano Babic a écrit :
>> Hi Albert,
>>
>> please pull from u-boot-imx.
>>
>> The following changes since commit 42d44f631c4e8e5359775bdc098f2fffde4e5c05:
>>
>>     Prepare v2011.03-rc1 (2011-02-02 22:37:32 +0100)
>>
>> are available in the git repository at:
>>     git://www.denx.de/git/u-boot-imx.git master
>
> Applied, thanks.
>
> Note pushing u-boot-arm/master caused a forced update of the remote
> branch although I had absolutely no error or warning when rebasing onto
> u-boot/master or merging u-boot-imx.

Note that I should note make notes while not having enough caffeine. The 
rebase *is* the cause of the forced update, apparently.

Amicalement,