[U-Boot] Pull request for u-boot-marvell.git

Albert ARIBAUD
2011-11-03T18:15:17Z

Hi Prafulla,

Le 01/11/2011 09:35, Prafulla Wadaskar a ?crit :
> Hi Albert
> Please pull
> The following changes since commit d0a755e860362ca35c6d6e4fa8a7a0d5fc7e3ea6:
> Michael Walle (1):
> kirkwood: define CONFIG_SYS_CACHELINE_SIZE
>
> are available in the git repository at:
>
> u-boot-marvell.git master branch.
>
> Holger Brunck (4):
> arm/km: add boardid and hwkey to kernel command line
> arm/km: trigger reconfiguration for the Xilinx FPGA
> arm/km: enable jffs2 cmds
> arm/km: adapt bootcounter evaluation
>
> Lei Wen (2):
> pantheon: define CONFIG_SYS_CACHELINE_SIZE
> armada100: define CONFIG_SYS_CACHELINE_SIZE
>
> Simon Guinot (2):
> netspace_v2: fix SDRAM configuration
> netspace_v2: enable I2C EEPROM support
>
> Thomas Herzmann (1):
> arm/km: portl2 environment address update to P1B
>
> Valentin Longchamp (1):
> ARM: Reintroduce MACH_TYPE_KM_KIRKWOOD for keymile ARM boards
>
> arch/arm/include/asm/arch-armada100/config.h | 2 +
> arch/arm/include/asm/arch-pantheon/config.h | 2 +
> board/LaCie/netspace_v2/kwbimage-is2.cfg | 162 ++++++++++++++++++++++++++
> board/LaCie/netspace_v2/kwbimage.cfg | 4 +-
> board/keymile/km_arm/km_arm.c | 44 +++++--
> boards.cfg | 2 +-
> include/configs/km/km_arm.h | 9 +-
> include/configs/km_kirkwood.h | 3 +
> include/configs/netspace_v2.h | 18 +++-
> include/configs/portl2.h | 6 +-
> 10 files changed, 234 insertions(+), 18 deletions(-)
> create mode 100644 board/LaCie/netspace_v2/kwbimage-is2.cfg

Applied to u-boot-arm/master, thanks.

Note that I get the following errors when fetching u-boot-marvell:

remote: error: refs/remotes/origin/mkimage does not point to a valid object!
remote: error: refs/tags/2009.01-rc2 does not point to a valid object!

The second one means you have a bigus tag, which should disappear with a

git push ssh://gu-marvell at git.denx.de/u-boot-marvell.git :2009.01-rc2

The first one seems more complex, as it is a bogus branch name in a
*remote* of u-boot-marvell -- I guess this can only be handled directly
by Wolfgang.

> Regards..
> Prafulla . . .

Amicalement,
--
Albert.