From: Wolfgang Denk <wd@denx.de>
Date: Thu, 23 Jun 2011 13:37:33 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-arm
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9623c158f6a5150a21c25026bfba79e7ff7912f5;p=project%2Fbcm63xx%2Fu-boot.git

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

* 'master' of git://git.denx.de/u-boot-arm:
  run arm_pci_init after relocation
  IXP42x PCI rewrite
  update/fix PDNB3 board
  update/fix IXDP425 / IXDPG425 boards
  add dvlhost (dLAN 200 AV Wireless G) board
  IXP NPE: add support for fixed-speed MII ports
  update/fix AcTux4 board
  update/fix AcTux3 board
  update/fix AcTux2 board
  update/fix AcTux1 board
  use -ffunction-sections / --gc-sections on IXP42x
  support CONFIG_SYS_LDSCRIPT on ARM
  fix "depend" target in npe directory
  Fix IXP code to work after relocation was added
  trigger hardware watchdog in IXP42x serial driver
  add support for IXP42x Rev. B1 and newer
  add XScale sub architecture (IXP/PXA) to maintainer list

Conflicts:
	arch/arm/lib/board.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
---

9623c158f6a5150a21c25026bfba79e7ff7912f5
diff --cc arch/arm/lib/board.c
index e7af3d223c,99bc2c70d4..169dfebcf1
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@@ -522,6 -530,14 +519,10 @@@ void board_init_r (gd_t *id, ulong dest
  	/* initialize environment */
  	env_relocate ();
  
+ #if defined(CONFIG_CMD_PCI) || defined(CONFIG_PCI)
+ 	arm_pci_init();
+ #endif
 -#ifdef CONFIG_VFD
 -	/* must do this after the framebuffer is allocated */
 -	drv_vfd_init();
 -#endif /* CONFIG_VFD */
+ 
  	/* IP Address */
  	gd->bd->bi_ip_addr = getenv_IPaddr ("ipaddr");