Merge ../u-boot

diff --combined Makefile
index a89a59575f328ce03b638be7e0d0d16fba111c9b,c1c64462f03988ab276ba8af98a51e333bedcae5..d3c96bcdcb51fcd6d322f8c16cded4cf04539d6e
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -22,9 -22,9 +22,9 @@@
  #
  
  VERSION = 1
- PATCHLEVEL = 2
+ PATCHLEVEL = 3
  SUBLEVEL = 0
- EXTRAVERSION =
+ EXTRAVERSION = -rc1
  U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
  VERSION_FILE = $(obj)include/version_autogenerated.h
  
@@@ -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-
@@@ -201,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
@@@ -326,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 \)`