Merge remote-tracking branch 'u-boot/master' into 'u-boot-arm/master'

Merge branch 'master' of git://git.denx.de/u-boot

Merge git://git.denx.de/u-boot-marvell

kirkwood: sheevaplug: add FDT support

LIBFDT feature is required to support new kernels.

Signed-off-by: Gérald Kerma <drEagle@doukki.net>
Reviewed-by: Luka Perkov <luka.perkov@sartura.hr>

kirkwood: sheevaplug: fix multiple defines

Signed-off-by: Gérald Kerma <drEagle@doukki.net>
Reviewed-by: Luka Perkov <luka.perkov@sartura.hr>

kirkwood: sheevaplug: fix style

Signed-off-by: Gérald Kerma <drEagle@doukki.net>
Reviewed-by: Luka Perkov <luka.perkov@sartura.hr>

Merge branch 'master' of git://git.denx.de/u-boot-marvell

kirkwood: sheevaplug: add CONFIG_SYS_GENERIC_BOARD define

Signed-off-by: Luka Perkov <luka@openwrt.org>
Acked-by: Stefan Roese <sr@denx.de>
CC: Prafulla Wadaskar <prafulla@marvell.com>

Merge branch 'master' of git://git.denx.de/u-boot-arm

Merge branch 'u-boot-marvell/master' into 'u-boot-arm/master'

ARM: sheevaplug: add HUSH parser

This patch add HUSH command parser

Signed-off-by: Gerald Kerma <drEagle@doukki.net>

Changes in v1:
- add HUSH command parser
Signed-off-by: Prafulla Wadaskar <pr

ARM: sheevaplug: add HUSH parser

This patch add HUSH command parser

Signed-off-by: Gerald Kerma <drEagle@doukki.net>

Changes in v1:
- add HUSH command parser
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>

show more ...

ARM: sheevaplug: redefine MTDPARTS

This patch redefine MTDPARTS

Signed-off-by: Gerald Kerma <drEagle@doukki.net>

Changes in v1:
- redefine MTDPARTS
Signed-off-by: Prafulla Wadaskar <prafulla@mar

ARM: sheevaplug: redefine MTDPARTS

This patch redefine MTDPARTS

Signed-off-by: Gerald Kerma <drEagle@doukki.net>

Changes in v1:
- redefine MTDPARTS
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>

show more ...

ARM: sheevaplug: add MTD defaults

This patch add MTDIDS and MTDPARTS defaults settings to sheevaplug

Signed-off-by: Gerald Kerma <drEagle@doukki.net>

Changes in v1:
- add MTDIDS and MTDPARTS def

ARM: sheevaplug: add MTD defaults

This patch add MTDIDS and MTDPARTS defaults settings to sheevaplug

Signed-off-by: Gerald Kerma <drEagle@doukki.net>

Changes in v1:
- add MTDIDS and MTDPARTS default to sheevaplug
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>

show more ...

ARM: sheevaplug: add MVSATA driver

This patch add MVSATA driver to sheevaplug

Signed-off-by: Gerald Kerma <drEagle@doukki.net>

Changes in v1:
- add MVSATA driver to sheevaplug
- enable ext4 FS

ARM: sheevaplug: add MVSATA driver

This patch add MVSATA driver to sheevaplug

Signed-off-by: Gerald Kerma <drEagle@doukki.net>

Changes in v1:
- add MVSATA driver to sheevaplug
- enable ext4 FS support
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>

show more ...

ARM: sheevaplug: change env location

This patch move the environment offset in sheevaplug.
The size of the u-boot binary is become too big.
Fix saving environments was result of corrupting the u-boo

ARM: sheevaplug: change env location

This patch move the environment offset in sheevaplug.
The size of the u-boot binary is become too big.
Fix saving environments was result of corrupting the u-boot.

Signed-off-by: Gerald Kerma <drEagle@doukki.net>

Changes in v2:
- patch description

Changes in v1:
- fix sheevaplug environment offset
Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>

show more ...

kirkwood: kconfig: refactor Kconfig and defconfig

Becuase the board select menu in arch/arm/Kconfig is too big,
move the KirkWood board select menu to kirkwood/Kconfig.

Consolidate also common sett

kirkwood: kconfig: refactor Kconfig and defconfig

Becuase the board select menu in arch/arm/Kconfig is too big,
move the KirkWood board select menu to kirkwood/Kconfig.

Consolidate also common settings (CONFIG_SYS_CPU="arm926ejs" and
CONFIG_SYS_SOC="kirkwood").

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Prafulla Wadasdkar <prafulla@marvell.com>
Cc: Luka Perkov <luka@openwrt.org>

show more ...

Merge branch 'master' of git://git.denx.de/u-boot-arm

Conflicts:
boards.cfg

Signed-off-by: Stefano Babic <sbabic@denx.de>

ARM: kirkwood: add mvsdio driver

This patch add Marvell kirkwood MVSDIO/MMC driver
and enable it for Sheevaplugs and OpenRD boards.

Signed-off-by: Gerald Kerma <drEagle@doukki.net>
Reviewed-by: Ste

ARM: kirkwood: add mvsdio driver

This patch add Marvell kirkwood MVSDIO/MMC driver
and enable it for Sheevaplugs and OpenRD boards.

Signed-off-by: Gerald Kerma <drEagle@doukki.net>
Reviewed-by: Stefan Roese <sr@denx.de>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>

show more ...

Merge git://git.denx.de/u-boot-arm

Conflicts:
board/freescale/mx6qsabrelite/Makefile
board/freescale/mx6qsabrelite/mx6qsabrelite.c
include/configs/mx6qsabrelite.h

Signed-off-by: Stefano Babic <s

Merge git://git.denx.de/u-boot-arm

Conflicts:
board/freescale/mx6qsabrelite/Makefile
board/freescale/mx6qsabrelite/mx6qsabrelite.c
include/configs/mx6qsabrelite.h

Signed-off-by: Stefano Babic <sbabic@denx.de>

show more ...

Merge branch 'u-boot/master' into u-boot-arm/master

Add GPL-2.0+ SPDX-License-Identifier to source files

Signed-off-by: Wolfgang Denk <wd@denx.de>
[trini: Fixup common/cmd_io.c]
Signed-off-by: Tom Rini <trini@ti.com>

Merge branch 'master' of git://git.denx.de/u-boot-arm

kirkwood: added common config file mv-common.h

It is observed that, in most of the board configs the code is being
duplicated, also for any common change all board files needs update
This issue was

kirkwood: added common config file mv-common.h

It is observed that, in most of the board configs the code is being
duplicated, also for any common change all board files needs update
This issue was under discussion from long on mailing list and we
converge on introducing common config file.

With this patch-
1. Total Kirkwood specific configuration code is reduced by 210 lines
2. All common configuration can be shared by multiple boards
3. Easy to manage common updates like ARM relocation changes

mv-common.h file is added to include/configs/
It contains all common configuration supported for all Kirkwood boards
The respective board configs are updated for its usage

Build tested for guruplug, mv88f6281gtw_ge, openrd_base,
rd6281a and sheevaplug
Binary execution tested for sheevaplug

Todo:
1. Other custom Kirkwood boards to be synced
2. The support to be extended for Orion5X based boards

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>

show more ...

kirkwood: added common config file mv-common.h

It is observed that, in most of the board configs the code is being
duplicated, also for any common change all board files needs update
This issue was

kirkwood: added common config file mv-common.h

It is observed that, in most of the board configs the code is being
duplicated, also for any common change all board files needs update
This issue was under discussion from long on mailing list and we
converge on introducing common config file.

With this patch-
1. Total Kirkwood specific configuration code is reduced by 210 lines
2. All common configuration can be shared by multiple boards
3. Easy to manage common updates like ARM relocation changes

mv-common.h file is added to include/configs/
It contains all common configuration supported for all Kirkwood boards
The respective board configs are updated for its usage

Build tested for guruplug, mv88f6281gtw_ge, openrd_base,
rd6281a and sheevaplug
Binary execution tested for sheevaplug

Todo:
1. Other custom Kirkwood boards to be synced
2. The support to be extended for Orion5X based boards

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>

show more ...

Merge branch 'master' of ../master