mbox

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

Message ID 4DF87B34.1060901@denx.de
State Changes Requested
Headers show

Pull-request

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

Message

Stefano Babic June 15, 2011, 9:28 a.m. UTC
Hi Albert,

please pull from u-boot-imx. There are only fix for a couple of still
broken boards.

The following changes since commit 9571865e0d32b1bcf8a6625497d1cd5d4bbad354:

  Merge branch 'master' of git://git.denx.de/u-boot-arm (2011-06-08
23:29:04 +0200)

are available in the git repository at:

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

Fabio Estevam (2):
      mx1ads: Fix build by using new relocation scheme
      imx31_phycore: Fix build by using new relocation scheme

Stefano Babic (1):
      MX31: QONG: drop config.mk

 board/davedenx/qong/config.mk       |    3 ---
 board/imx31_phycore/config.mk       |    1 -
 board/imx31_phycore/imx31_phycore.c |   20 +++++++++++++-------
 board/mx1ads/config.mk              |   25 -------------------------
 board/mx1ads/mx1ads.c               |   27 +++++++++++++++++++--------
 include/configs/imx31_phycore.h     |   12 ++++++++++++
 include/configs/mx1ads.h            |   10 ++++++++++
 include/configs/qong.h              |    4 +++-
 8 files changed, 57 insertions(+), 45 deletions(-)
 delete mode 100644 board/davedenx/qong/config.mk
 delete mode 100644 board/imx31_phycore/config.mk
 delete mode 100644 board/mx1ads/config.mk

Thanks,
Stefano

Comments

Albert ARIBAUD June 17, 2011, 7:24 p.m. UTC | #1
Hi Stefano,

Le 15/06/2011 11:28, Stefano Babic a écrit :
> Hi Albert,
>
> please pull from u-boot-imx. There are only fix for a couple of still
> broken boards.
>
> The following changes since commit 9571865e0d32b1bcf8a6625497d1cd5d4bbad354:
>
>    Merge branch 'master' of git://git.denx.de/u-boot-arm (2011-06-08
> 23:29:04 +0200)
>
> are available in the git repository at:
>
>    git://www.denx.de/git/u-boot-imx.git master

Your request is based on u-boot/master... Can you please resend a pull 
request based on u-boot-arm/master? Please wait until I have pulled in 
Prafulla's pull request then you can fetch u-boot-arm/master and rebase 
on it. Sorry for the delay.

Amicalement,
Albert ARIBAUD June 17, 2011, 7:37 p.m. UTC | #2
Hi again Stefano,

Le 17/06/2011 21:24, Albert ARIBAUD a écrit :
> Hi Stefano,
>
> Le 15/06/2011 11:28, Stefano Babic a écrit :
>> Hi Albert,
>>
>> please pull from u-boot-imx. There are only fix for a couple of still
>> broken boards.
>>
>> The following changes since commit
>> 9571865e0d32b1bcf8a6625497d1cd5d4bbad354:
>>
>> Merge branch 'master' of git://git.denx.de/u-boot-arm (2011-06-08
>> 23:29:04 +0200)
>>
>> are available in the git repository at:
>>
>> git://www.denx.de/git/u-boot-imx.git master
>
> Your request is based on u-boot/master... Can you please resend a pull
> request based on u-boot-arm/master? Please wait until I have pulled in
> Prafulla's pull request then you can fetch u-boot-arm/master and rebase
> on it. Sorry for the delay.

Update: actually, can you rebase on u-boot-arm/master as it is 
currently, and submit your pull request now? I'll pull Marvell in later.

Amicalement,