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>

diff --combined MAINTAINERS
index ae258d9e0a5e408ddfa3de7b7f9960626fcb2075,60b7fedc90e559310ba8082f2d05aa3e892fadb4..2bba7b44ab41f7508a41fb978d82c12dbf3a04e6
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -569,8 -569,8 +569,8 @@@ Stefano Babic <sbabic@denx.de
        ea20            davinci
        mx35pdk         i.MX35
        mx51evk         i.MX51
-       polaris         xscale
-       trizepsiv       xscale
+       polaris         xscale/pxa
+       trizepsiv       xscale/pxa
        vision2         i.MX51
  
  Jason Liu <r64343@freescale.com>
@@@ -603,7 -603,7 +603,7 @@@ Andreas Bießmann <andreas.devel@gmail.c
  
  Cliff Brake <cliff.brake@gmail.com>
  
-       pxa255_idp      xscale
+       pxa255_idp      xscale/pxa
  
  Rick Bronson <rick@efn.org>
  
@@@ -677,6 -677,7 +677,6 @@@ Grazvydas Ignotas <notasas@gmail.com
  Gary Jennejohn <garyj@denx.de>
  
        smdk2400        ARM920T
 -      trab            ARM920T
  
  Matthias Kaehlcke <matthias@kaehlcke.net>
        edb9301                 ARM920T (EP9301)
@@@ -717,7 -718,7 +717,7 @@@ Sergey Kubushyn <ksi@koi8.net
  
  Prakash Kumar <prakash@embedx.com>
  
-       cerf250         xscale
+       cerf250         xscale/pxa
  
  Vipin Kumar <vipin.kumar@st.com>
  
@@@ -795,9 -796,9 +795,9 @@@ John Rigby <jcrigby@gmail.com
  
  Stefan Roese <sr@denx.de>
  
-       ixdpg425        xscale
-       pdnb3           xscale
-       scpu            xscale
+       ixdpg425        xscale/ixp
+       pdnb3           xscale/ixp
+       scpu            xscale/ixp
  
  Alessandro Rubini <rubini@unipv.it>
  Nomadik Linux Team <STN_WMM_nomadik_linux@list.st.com>
@@@ -823,15 -824,16 +823,16 @@@ Heiko Schocher <hs@denx.de
  
  Robert Schwebel <r.schwebel@pengutronix.de>
  
-       csb226          xscale
-       innokom         xscale
+       csb226          xscale/pxa
+       innokom         xscale/pxa
  
  Michael Schwingen <michael@schwingen.org>
  
-       actux1          xscale
-       actux2          xscale
-       actux3          xscale
-       actux4          xscale
+       actux1          xscale/ixp
+       actux2          xscale/ixp
+       actux3          xscale/ixp
+       actux4          xscale/ixp
+       dvlhost         xscale/ixp
  
  Andrea Scian <andrea.scian@dave-tech.it>
  
@@@ -855,12 -857,12 +856,12 @@@ Greg Ungerer <greg.ungerer@opengear.com
  
  Marek Vasut <marek.vasut@gmail.com>
  
-       balloon3        xscale
-       colibri_pxa270  xscale
-       palmld          xscale
-       palmtc          xscale
-       vpac270         xscale
-       zipitz2         xscale
+       balloon3        xscale/pxa
+       colibri_pxa270  xscale/pxa
+       palmld          xscale/pxa
+       palmtc          xscale/pxa
+       vpac270         xscale/pxa
+       zipitz2         xscale/pxa
        efikamx         i.MX51
  
  Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
@@@ -911,9 -913,9 +912,9 @@@ Sughosh Ganu <urwithsughosh@gmail.com
  Unknown / orphaned boards:
        Board           CPU     Last known maintainer / Comment
  .........................................................................
-       cradle          xscale  Kyle Harris <kharris@nexus-tech.net> / dead address
-       ixdp425         xscale  Kyle Harris <kharris@nexus-tech.net> / dead address
-       lubbock         xscale  Kyle Harris <kharris@nexus-tech.net> / dead address
+       cradle          xscale/pxa      Kyle Harris <kharris@nexus-tech.net> / dead address
+       ixdp425         xscale/ixp      Kyle Harris <kharris@nexus-tech.net> / dead address
+       lubbock         xscale/pxa      Kyle Harris <kharris@nexus-tech.net> / dead address
  
        imx31_phycore_eet i.MX31  Guennadi Liakhovetski <g.liakhovetski@gmx.de> / resigned
        mx31ads           i.MX31  Guennadi Liakhovetski <g.liakhovetski@gmx.de> / resigned

diff --combined arch/arm/include/asm/global_data.h
index d4c9afcd0b92fa8dfb40809b650afc4feb686fa3,c1a59f2c938d181a813b1762018e11869508c0d8..ef9959e6eefc53144707026f2e4c7df7bdd3a5f5
--- 1/arch/arm/include/asm/global_data.h
--- 2/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@@ -41,6 -41,9 +41,6 @@@ typedef       struct  global_data 
        unsigned long   env_addr;       /* Address  of Environment struct */
        unsigned long   env_valid;      /* Checksum of Environment valid? */
        unsigned long   fb_base;        /* base address of frame buffer */
 -#ifdef CONFIG_VFD
 -      unsigned char   vfd_type;       /* display type */
 -#endif
  #ifdef CONFIG_FSL_ESDHC
        unsigned long   sdhc_clk;
  #endif
@@@ -60,6 -63,9 +60,9 @@@
        unsigned long   tbu;
        unsigned long long      timer_reset_value;
        unsigned long   lastinc;
+ #endif
+ #ifdef CONFIG_IXP425
+       unsigned long   timestamp;
  #endif
        unsigned long   relocaddr;      /* Start address of U-Boot in RAM */
        phys_size_t     ram_size;       /* RAM size */

diff --combined arch/arm/lib/board.c
index e7af3d223caa56d1a2477dca1351aed26deb8158,99bc2c70d43ea1f87f14c81d7127365ab401b628..169dfebcf157432218f4953550bdb1dea5eca0c2
--- 1/arch/arm/lib/board.c
--- 2/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@@ -262,9 -262,6 +262,6 @@@ init_fnc_t *init_sequence[] = 
        init_func_i2c,
  #endif
        dram_init,              /* configure available RAM banks */
- #if defined(CONFIG_CMD_PCI) || defined (CONFIG_PCI)
-       arm_pci_init,
- #endif
        NULL,
  };
  
@@@ -344,6 -341,17 +341,6 @@@ void board_init_f (ulong bootflag
        addr &= ~(4096 - 1);
        debug ("Top of RAM usable for U-Boot at: %08lx\n", addr);
  
 -#ifdef CONFIG_VFD
 -#     ifndef PAGE_SIZE
 -#       define PAGE_SIZE 4096
 -#     endif
 -      /*
 -       * reserve memory for VFD display (always full pages)
 -       */
 -      addr -= vfd_setmem (addr);
 -      gd->fb_base = addr;
 -#endif /* CONFIG_VFD */
 -
  #ifdef CONFIG_LCD
  #ifdef CONFIG_FB_ADDR
        gd->fb_base = CONFIG_FB_ADDR;
@@@ -522,6 -530,14 +519,10 @@@ void board_init_r (gd_t *id, ulong dest
        /* initialize environment */
        env_relocate ();
  
 -#ifdef CONFIG_VFD
 -      /* must do this after the framebuffer is allocated */
 -      drv_vfd_init();
 -#endif /* CONFIG_VFD */
+ #if defined(CONFIG_CMD_PCI) || defined(CONFIG_PCI)
+       arm_pci_init();
+ #endif
+ 
        /* IP Address */
        gd->bd->bi_ip_addr = getenv_IPaddr ("ipaddr");