[U-Boot] [GIT PULL] Pull request: u-boot-imx
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
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,
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,
On 06/17/2011 09:37 PM, Albert ARIBAUD wrote:
Hi again Stefano,
Hi Albert,
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.
Done.
The following changes since commit 7b2fac7654f7420c2787f74ec3b1540fa3b343e9:
omap730p2: fix build breaks (2011-06-09 08:54:57 -0400)
are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master
Fabio Estevam (3): mx1ads: Fix build by using new relocation scheme imx31_phycore: Fix build by using new relocation scheme mx31pdk: Add DHCP command
Helmut Raiger (1): mxc_spi.c: typo fixed
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 +++++++++++++++++++-------- drivers/spi/mxc_spi.c | 2 +- include/configs/imx31_phycore.h | 12 ++++++++++++ include/configs/mx1ads.h | 10 ++++++++++ include/configs/mx31pdk.h | 1 + include/configs/qong.h | 4 +++- 10 files changed, 59 insertions(+), 46 deletions(-) delete mode 100644 board/davedenx/qong/config.mk delete mode 100644 board/imx31_phycore/config.mk delete mode 100644 board/mx1ads/config.mk
Best regards, Stefano Babic
Hi Stefano,
Le 18/06/2011 11:59, Stefano Babic a écrit :
On 06/17/2011 09:37 PM, Albert ARIBAUD wrote:
Hi again Stefano,
Hi Albert,
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.
Done.
The following changes since commit 7b2fac7654f7420c2787f74ec3b1540fa3b343e9:
omap730p2: fix build breaks (2011-06-09 08:54:57 -0400)
are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master
Fabio Estevam (3): mx1ads: Fix build by using new relocation scheme imx31_phycore: Fix build by using new relocation scheme mx31pdk: Add DHCP command
Helmut Raiger (1): mxc_spi.c: typo fixed
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 +++++++++++++++++++-------- drivers/spi/mxc_spi.c | 2 +- include/configs/imx31_phycore.h | 12 ++++++++++++ include/configs/mx1ads.h | 10 ++++++++++ include/configs/mx31pdk.h | 1 + include/configs/qong.h | 4 +++- 10 files changed, 59 insertions(+), 46 deletions(-) delete mode 100644 board/davedenx/qong/config.mk delete mode 100644 board/imx31_phycore/config.mk delete mode 100644 board/mx1ads/config.mk
Best regards, Stefano Babic
Thanks a lot! Applied to u-boot-arm/master.
Amicalement,
participants (2)
-
Albert ARIBAUD -
Stefano Babic