[U-Boot] Pull request: u-boot-arm/master

Wolfgang Denk
2011-06-08T21:32:52Z

Dear Albert ARIBAUD,

In message <4DEFDE71.7010609@aribaud.net> you wrote:
> Hi Wolfgang,
>
> The following changes since commit 6f4dd40cddbd69c56fec1285fee02cbd5a3833d8:
>
> Prepare v2011.06-rc2 (2011-06-02 23:19:27 +0200)
>
> are available in the git repository at:
> git://git.denx.de/u-boot-arm.git master
>
> Fabio Estevam (4):
> mx31ads: Use the new relocation scheme
> mx31litekit: Fix boot with the new relocation scheme.
> imx31_litekit: Remove local config.mk
> imx27lite: Remove local config.mk
>
> Felix Radensky (1):
> mx31ads: Fix environment location on flash
>
> Minkyu Kang (1):
> SMDK6400: fix the compiler error
>
> board/freescale/mx31ads/config.mk | 1 -
> board/freescale/mx31ads/mx31ads.c | 19 +++++++++--
> board/freescale/mx31ads/u-boot.lds | 42
> +++++++++++++++++++++------
> board/logicpd/imx27lite/config.mk | 5 ---
> board/logicpd/imx31_litekit/config.mk | 1 -
> board/logicpd/imx31_litekit/imx31_litekit.c | 17 +++++++----
> board/samsung/smdk6400/u-boot-nand.lds | 2 +
> include/configs/imx27lite-common.h | 2 +
> include/configs/imx31_litekit.h | 3 ++
> include/configs/mx31ads.h | 21 +++++++++----
> 10 files changed, 80 insertions(+), 33 deletions(-)
> delete mode 100644 board/freescale/mx31ads/config.mk
> delete mode 100644 board/logicpd/imx27lite/config.mk
> delete mode 100644 board/logicpd/imx31_litekit/config.mk

Applied, thanks.

Best regards,

Wolfgang Denk

--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
It is much easier to suggest solutions when you know nothing