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

diff --combined MAKEALL
index d58b15c,73974f7..f8c912b
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -387,8 -387,6 +387,8 @@@ LIST_85xx="                
        TQM8540         \
        TQM8541         \
        TQM8548         \
 +      TQM8548_AG      \
 +      TQM8548_BE      \
        TQM8555         \
        TQM8560         \
        XPEDITE5200     \
@@@ -544,6 -542,7 +544,7 @@@ LIST_ARM11="               
        imx31_litekit   \
        imx31_phycore   \
        mx31ads         \
+       qong            \
        smdk6400        \
  "
  

diff --combined Makefile
index ee82c5d,7508e1d..5ac2980
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -2479,20 -2479,16 +2479,20 @@@ stxssa_4M_config:    unconfi
  TQM8540_config                \
  TQM8541_config                \
  TQM8548_config                \
 +TQM8548_AG_config     \
 +TQM8548_BE_config     \
  TQM8555_config                \
  TQM8560_config:               unconfig
        @mkdir -p $(obj)include
 -      @CTYPE=$(subst TQM,,$(@:_config=)); \
 -      $(XECHO) "... TQM"$${CTYPE}; \
 +      @BTYPE=$(@:_config=); \
 +      CTYPE=$(subst TQM,,$(subst _AG,,$(subst _BE,,$(@:_config=)))); \
 +      $(XECHO) "... "$${BTYPE}" (MPC"$${CTYPE}")"; \
        echo "#define CONFIG_MPC$${CTYPE}">>$(obj)include/config.h; \
 -      echo "#define CONFIG_TQM$${CTYPE}">>$(obj)include/config.h; \
 +      echo "#define CONFIG_$${BTYPE}">>$(obj)include/config.h; \
        echo "#define CONFIG_HOSTNAME tqm$${CTYPE}">>$(obj)include/config.h; \
 -      echo "#define CONFIG_BOARDNAME \"TQM$${CTYPE}\"">>$(obj)include/config.h;
 +      echo "#define CONFIG_BOARDNAME \"$${BTYPE}\"">>$(obj)include/config.h;
        @$(MKCONFIG) -a TQM85xx ppc mpc85xx tqm85xx tqc
 +      @echo "CONFIG_$(@:_config=) = y">>$(obj)include/config.mk;
  
  XPEDITE5200_config:   unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx xpedite5200 xes
@@@ -3038,6 -3034,10 +3038,10 @@@ mx31ads_config                : unconfi
  omap2420h4_config     : unconfig
        @$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4 NULL omap24xx
  
+ qong_config           : unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm1136 qong davedenx mx31
+ 
+ 
  #########################################################################
  ## ARM1176 Systems
  #########################################################################

diff --combined include/netdev.h
index ba5f8d2,5c568f3..2794ddd
--- 1/include/netdev.h
--- 2/include/netdev.h
+++ b/include/netdev.h
@@@ -12,7 -12,7 +12,7 @@@
   *
   * This program is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.       See the
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   * GNU General Public License for more details.
   *
   * You should have received a copy of the GNU General Public License
@@@ -44,6 -44,7 +44,7 @@@ int cpu_eth_init(bd_t *bis)
  int au1x00_enet_initialize(bd_t*);
  int bfin_EMAC_initialize(bd_t *bis);
  int dc21x4x_initialize(bd_t *bis);
+ int dnet_eth_initialize(int id, void *regs, unsigned int phy_addr);
  int e1000_initialize(bd_t *bis);
  int eepro100_initialize(bd_t *bis);
  int eth_3com_initialize (bd_t * bis);

diff --combined lib_arm/board.c
index fe68df0,41f7603..f125d38
--- 1/lib_arm/board.c
--- 2/lib_arm/board.c
+++ b/lib_arm/board.c
@@@ -287,9 -287,6 +287,6 @@@ void start_armboot (void
  {
        init_fnc_t **init_fnc_ptr;
        char *s;
- #if !defined(CONFIG_SYS_NO_FLASH) || defined (CONFIG_VFD) || defined(CONFIG_LCD)
-       ulong size;
- #endif
  #if defined(CONFIG_VFD) || defined(CONFIG_LCD)
        unsigned long addr;
  #endif
@@@ -315,8 -312,7 +312,7 @@@
  
  #ifndef CONFIG_SYS_NO_FLASH
        /* configure available FLASH banks */
-       size = flash_init ();
-       display_flash_config (size);
+       display_flash_config (flash_init ());
  #endif /* CONFIG_SYS_NO_FLASH */
  
  #ifdef CONFIG_VFD
@@@ -328,7 -324,7 +324,7 @@@
         */
        /* bss_end is defined in the board-specific linker script */
        addr = (_bss_end + (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1);
-       size = vfd_setmem (addr);
+       vfd_setmem (addr);
        gd->fb_base = addr;
  #endif /* CONFIG_VFD */
  
@@@ -343,7 -339,7 +339,7 @@@
                 */
                /* bss_end is defined in the board-specific linker script */
                addr = (_bss_end + (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1);
-               size = lcd_setmem (addr);
+               lcd_setmem (addr);
                gd->fb_base = addr;
        }
  #endif /* CONFIG_LCD */
@@@ -416,11 -412,6 +412,11 @@@
  
        jumptable_init ();
  
 +#if defined(CONFIG_API)
 +      /* Initialize API */
 +      api_init ();
 +#endif
 +
        console_init_r ();      /* fully init console as a device */
  
  #if defined(CONFIG_MISC_INIT_R)