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

diff --combined Makefile
index 10bb6a8b8682ee0c70eb46a35007f62e89ef32dd,0371d4619d407f634b3b0bbfe6b64e39a009673e..a89a59575f328ce03b638be7e0d0d16fba111c9b
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -144,7 -144,7 +144,7 @@@ ifeq ($(ARCH),m68k
  CROSS_COMPILE = m68k-elf-
  endif
  ifeq ($(ARCH),microblaze)
 -CROSS_COMPILE = mb-
 +CROSS_COMPILE = microblaze-uclinux-
  endif
  ifeq ($(ARCH),blackfin)
  CROSS_COMPILE = bfin-uclinux-
@@@ -190,6 -190,8 +190,8 @@@ endi
  OBJS := $(addprefix $(obj),$(OBJS))
  
  LIBS  = lib_generic/libgeneric.a
+ LIBS += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \
+       "board/$(VENDOR)/common/lib$(VENDOR).a"; fi)
  LIBS += board/$(BOARDDIR)/lib$(BOARD).a
  LIBS += cpu/$(CPU)/lib$(CPU).a
  ifdef SOC
@@@ -199,9 -201,8 +201,9 @@@ ifeq ($(CPU),ixp
  LIBS += cpu/ixp/npe/libnpe.a
  endif
  LIBS += lib_$(ARCH)/lib$(ARCH).a
 -LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a \
 -      fs/reiserfs/libreiserfs.a fs/ext2/libext2fs.a
 +LIBS += fs/cramfs/libcramfs.a fs/ext2/libext2fs.a fs/fat/libfat.a \
 +      fs/fdos/libfdos.a fs/jffs2/libjffs2.a fs/reiserfs/libreiserfs.a \
 +      fs/romfs/libromfs.a
  LIBS += net/libnet.a
  LIBS += disk/libdisk.a
  LIBS += rtc/librtc.a
@@@ -210,13 -211,14 +212,14 @@@ LIBS += drivers/libdrivers.
  LIBS += drivers/bios_emulator/libatibiosemu.a
  LIBS += drivers/nand/libnand.a
  LIBS += drivers/nand_legacy/libnand_legacy.a
- LIBS += drivers/net/libnetdrv.a
+ LIBS += drivers/net/libnet.a
  ifeq ($(CPU),mpc83xx)
  LIBS += drivers/qe/qe.a
  endif
  ifeq ($(CPU),mpc85xx)
  LIBS += drivers/qe/qe.a
  endif
+ LIBS += drivers/serial/libserial.a
  LIBS += drivers/sk98lin/libsk98lin.a
  LIBS += post/libpost.a post/drivers/libpostdrivers.a
  LIBS += $(shell if [ -d post/lib_$(ARCH) ]; then echo \
@@@ -323,14 -325,14 +326,14 @@@ depend dep
  tags ctags:
                ctags -w -o $(OBJTREE)/ctags `find $(SUBDIRS) include \
                                lib_generic board/$(BOARDDIR) cpu/$(CPU) lib_$(ARCH) \
 -                              fs/cramfs fs/fat fs/fdos fs/jffs2 \
 +                              fs/cramfs fs/fat fs/fdos fs/jffs2 fs/romfs\
                                net disk rtc dtt drivers drivers/sk98lin common \
                        \( -name CVS -prune \) -o \( -name '*.[ch]' -print \)`
  
  etags:
                etags -a -o $(OBJTREE)/etags `find $(SUBDIRS) include \
                                lib_generic board/$(BOARDDIR) cpu/$(CPU) lib_$(ARCH) \
 -                              fs/cramfs fs/fat fs/fdos fs/jffs2 \
 +                              fs/cramfs fs/fat fs/fdos fs/jffs2 fs/romfs\
                                net disk rtc dtt drivers drivers/sk98lin common \
                        \( -name CVS -prune \) -o \( -name '*.[ch]' -print \)`
  
@@@ -1639,6 -1641,31 +1642,31 @@@ ZPC1900_config: unconfi
  ## Coldfire
  #########################################################################
  
+ M5235EVB_config \
+ M5235EVB_Flash16_config \
+ M5235EVB_Flash32_config:      unconfig
+       @case "$@" in \
+       M5235EVB_config)                FLASH=16;; \
+       M5235EVB_Flash16_config)        FLASH=16;; \
+       M5235EVB_Flash32_config)        FLASH=32;; \
+       esac; \
+       >include/config.h ; \
+       if [ "$${FLASH}" != "16" ] ; then \
+               echo "#define NORFLASH_PS32BIT  1" >> include/config.h ; \
+               echo "TEXT_BASE = 0xFFC00000" > $(obj)board/freescale/m5235evb/config.tmp ; \
+               cp $(obj)board/freescale/m5235evb/u-boot.32 $(obj)board/freescale/m5235evb/u-boot.lds ; \
+       else \
+               echo "TEXT_BASE = 0xFFE00000" > $(obj)board/freescale/m5235evb/config.tmp ; \
+               cp $(obj)board/freescale/m5235evb/u-boot.16 $(obj)board/freescale/m5235evb/u-boot.lds ; \
+       fi
+       @$(MKCONFIG) -a M5235EVB m68k mcf523x m5235evb freescale
+ 
+ M5249EVB_config :             unconfig
+       @$(MKCONFIG) $(@:_config=) m68k mcf52x2 m5249evb freescale
+ 
+ M5253EVBE_config :            unconfig
+       @$(MKCONFIG) $(@:_config=) m68k mcf52x2 m5253evbe freescale
+ 
  cobra5272_config :            unconfig
        @$(MKCONFIG) $(@:_config=) m68k mcf52x2 cobra5272
  
@@@ -1674,6 -1701,46 +1702,46 @@@ TASREG_config :               unconfi
  r5200_config :                unconfig
        @$(MKCONFIG) $(@:_config=) m68k mcf52x2 r5200
  
+ M5329AFEE_config \
+ M5329BFEE_config :    unconfig
+       @case "$@" in \
+       M5329AFEE_config)       NAND=0;; \
+       M5329BFEE_config)       NAND=16;; \
+       esac; \
+       >include/config.h ; \
+       if [ "$${NAND}" != "0" ] ; then \
+               echo "#define NANDFLASH_SIZE    $${NAND}" > $(obj)include/config.h ; \
+       fi
+       @$(MKCONFIG) -a M5329EVB m68k mcf532x m5329evb freescale
+ 
+ M54455EVB_config \
+ M54455EVB_atmel_config \
+ M54455EVB_intel_config \
+ M54455EVB_a33_config \
+ M54455EVB_a66_config \
+ M54455EVB_i33_config \
+ M54455EVB_i66_config :        unconfig
+       @case "$@" in \
+       M54455EVB_config)               FLASH=ATMEL; FREQ=33333333;; \
+       M54455EVB_atmel_config)         FLASH=ATMEL; FREQ=33333333;; \
+       M54455EVB_intel_config)         FLASH=INTEL; FREQ=33333333;; \
+       M54455EVB_a33_config)           FLASH=ATMEL; FREQ=33333333;; \
+       M54455EVB_a66_config)           FLASH=ATMEL; FREQ=66666666;; \
+       M54455EVB_i33_config)           FLASH=INTEL; FREQ=33333333;; \
+       M54455EVB_i66_config)           FLASH=INTEL; FREQ=66666666;; \
+       esac; \
+       >include/config.h ; \
+       if [ "$${FLASH}" == "INTEL" ] ; then \
+               echo "#undef CFG_ATMEL_BOOT" >> $(obj)include/config.h ; \
+               echo "... with INTEL boot..." ; \
+       else \
+               echo "#define CFG_ATMEL_BOOT"   >> $(obj)include/config.h ; \
+               echo "... with ATMEL boot..." ; \
+       fi; \
+       echo "#define CFG_INPUT_CLKSRC $${FREQ}" >> $(obj)include/config.h ; \
+       echo "... with $${FREQ}Hz input clock"
+       @$(MKCONFIG) -a M54455EVB m68k mcf5445x m54455evb freescale
+ 
  #########################################################################
  ## MPC83xx Systems
  #########################################################################
@@@ -1690,7 -1757,7 +1758,7 @@@ MPC8313ERDB_66_config: unconfi
                echo -n "...66M..." ; \
                echo "#define CFG_66MHZ" >>$(obj)include/config.h ; \
        fi ;
-       @$(MKCONFIG) -a MPC8313ERDB ppc mpc83xx mpc8313erdb
+       @$(MKCONFIG) -a MPC8313ERDB ppc mpc83xx mpc8313erdb freescale
  
  MPC8323ERDB_config:   unconfig
        @$(MKCONFIG) -a MPC8323ERDB ppc mpc83xx mpc8323erdb freescale
@@@ -1718,10 -1785,10 +1786,10 @@@ MPC832XEMDS_SLAVE_config:    unconfi
                echo -n "...66M..." ; \
                echo "#define PCI_66M" >>$(obj)include/config.h ; \
        fi ;
-       @$(MKCONFIG) -a MPC832XEMDS ppc mpc83xx mpc832xemds
+       @$(MKCONFIG) -a MPC832XEMDS ppc mpc83xx mpc832xemds freescale
  
  MPC8349EMDS_config:   unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc83xx mpc8349emds
+       @$(MKCONFIG) $(@:_config=) ppc mpc83xx mpc8349emds freescale
  
  MPC8349ITX_config \
  MPC8349ITX_LOWBOOT_config \
@@@ -1735,7 -1802,7 +1803,7 @@@ MPC8349ITXGP_config:    unconfi
        @if [ "$(findstring LOWBOOT,$@)" ] ; then \
                echo "TEXT_BASE = 0xFE000000" >$(obj)board/mpc8349itx/config.tmp ; \
        fi
-       @$(MKCONFIG) -a -n $(@:_config=) MPC8349ITX ppc mpc83xx mpc8349itx
+       @$(MKCONFIG) -a -n $(@:_config=) MPC8349ITX ppc mpc83xx mpc8349itx freescale
  
  MPC8360EMDS_config \
  MPC8360EMDS_HOST_33_config \
@@@ -1760,7 -1827,7 +1828,7 @@@ MPC8360EMDS_SLAVE_config:       unconfi
                echo -n "...66M..." ; \
                echo "#define PCI_66M" >>$(obj)include/config.h ; \
        fi ;
-       @$(MKCONFIG) -a MPC8360EMDS ppc mpc83xx mpc8360emds
+       @$(MKCONFIG) -a MPC8360EMDS ppc mpc83xx mpc8360emds freescale
  
  sbc8349_config:               unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc83xx sbc8349
@@@ -1902,7 -1969,7 +1970,7 @@@ TQM8560_config:         unconfi
  #########################################################################
  
  MPC8641HPCN_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc86xx mpc8641hpcn
+       @$(MKCONFIG) $(@:_config=) ppc mpc86xx mpc8641hpcn freescale
  
  sbc8641d_config:      unconfig
        @./mkconfig $(@:_config=) ppc mpc86xx sbc8641d
@@@ -2267,6 -2334,9 +2335,9 @@@ scpu_config:    unconfi
  pxa255_idp_config:    unconfig
        @$(MKCONFIG) $(@:_config=) arm pxa pxa255_idp
  
+ trizepsiv_config      :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm pxa trizepsiv
+ 
  wepep250_config       :       unconfig
        @$(MKCONFIG) $(@:_config=) arm pxa wepep250
  

diff --combined drivers/net/Makefile
index 7342dc8ce6c78ad6a59c9780fbd252e9e8ccff34,37d69b9949bd94d6a97d272f32c6cc626d8b6a99..063985984ebb9c3b5432463eb4eaf4af637a9e13
--- 1/drivers/net/Makefile
--- 2/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@@ -23,9 -23,9 +23,8 @@@
  
  include $(TOPDIR)/config.mk
  
- LIB   := $(obj)libnetdrv.a
- 
- COBJS         := xilinx_emaclite.o xilinx_emac.o
+ LIB   := $(obj)libnet.a
 -
 -COBJS         := mcffec.o
++COBJS         := mcffec.o xilinx_emac.o xilinx_emaclite.o
  
  SRCS  := $(COBJS:.o=.c)
  OBJS  := $(addprefix $(obj),$(COBJS))