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

diff --combined MAKEALL
index 52f3cd34783961cdad47a859c2e5b2b9b00ad844,4cbddc2a7595399ccc075b3b33580b8f46fed963..9e59823324c1496c6fe24348afb047f25568cab4
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -168,7 -168,6 +168,6 @@@ LIST_4xx="         
        CPCI4052        \
        CPCI405AB       \
        CPCI405DT       \
-       CPCI440         \
        CPCIISER4       \
        CRAYL1          \
        csb272          \
@@@ -180,6 -179,8 +179,8 @@@
        ERIC            \
        EXBITGEN        \
        G2000           \
+       haleakala       \
+       haleakala_nand  \
        hcu4            \
        hcu5            \
        HH405           \
@@@ -187,8 -188,12 +188,12 @@@
        JSE             \
        KAREF           \
        katmai          \
+       kilauea         \
+       kilauea_nand    \
+       korat           \
        luan            \
        lwmon5          \
+       makalu          \
        METROBOX        \
        MIP405          \
        MIP405T         \
@@@ -203,6 -208,7 +208,7 @@@
        PIP405          \
        PLU405          \
        PMC405          \
+       PMC440          \
        PPChameleonEVB  \
        rainier         \
        sbc405          \
@@@ -342,6 -348,7 +348,7 @@@ LIST_85xx="                
  #########################################################################
  
  LIST_86xx="           \
+       MPC8610HPCD     \
        MPC8641HPCN     \
        sbc8641d        \
  "
@@@ -378,6 -385,7 +385,7 @@@ LIST_7xx="         
  
  LIST_ppc="            \
        ${LIST_5xx}     \
+       ${LIST_512x}    \
        ${LIST_5xxx}    \
        ${LIST_8xx}     \
        ${LIST_8220}    \
@@@ -476,7 -484,6 +484,7 @@@ LIST_ARM10="               
  LIST_ARM11="          \
        cp1136          \
        omap2420h4      \
 +      apollon         \
  "
  
  #########################################################################
@@@ -555,6 -562,7 +563,7 @@@ LIST_mips5kc_el="
  
  LIST_au1xx0_el="      \
        dbau1550_el     \
+       pb1000          \
  "
  
  LIST_mips_el="                        \
@@@ -641,6 -649,8 +650,8 @@@ LIST_coldfire="                    
  
  LIST_avr32="          \
        atstk1002       \
+       atstk1003       \
+       atstk1004       \
  "
  
  #########################################################################
@@@ -654,6 -664,23 +665,23 @@@ LIST_blackfin="          
        bf561-ezkit     \
  "
  
+ #########################################################################
+ ## SH Systems
+ #########################################################################
+ 
+ LIST_sh4="            \
+       ms7750se        \
+       ms7722se        \
+ "
+ 
+ LIST_sh3=""
+ 
+ 
+ LIST_sh="             \
+       ${LIST_sh3}     \
+       ${LIST_sh4}     \
+ "
+ 
  #-----------------------------------------------------------------------
  
  #----- for now, just run PPC by default -----
@@@ -688,7 -715,9 +716,9 @@@ d
        mips|mips_el| \
        nios|nios2| \
        ppc|5xx|5xxx|512x|8xx|8220|824x|8260|83xx|85xx|86xx|4xx|7xx|74xx| \
-       x86|I486|TSEC)
+       x86|I486|TSEC| \
+       sh|sh4|sh3 \
+       )
                        for target in `eval echo '$LIST_'${arg}`
                        do
                                build_target ${target}

diff --combined Makefile
index e2a367eaf7c0c2284397a68eae907268ad8a1207,35e90315f4ce1d2607b3d459854d0422add3b5f9..8417b0c56d9833308bf6483c8c1549dcc139414c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -23,8 -23,8 +23,8 @@@
  
  VERSION = 1
  PATCHLEVEL = 3
- SUBLEVEL = 0
- EXTRAVERSION = -rc3
+ SUBLEVEL = 1
+ EXTRAVERSION =
  U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
  VERSION_FILE = $(obj)include/version_autogenerated.h
  
@@@ -152,6 -152,9 +152,9 @@@ endi
  ifeq ($(ARCH),avr32)
  CROSS_COMPILE = avr32-linux-
  endif
+ ifeq ($(ARCH),sh)
+ CROSS_COMPILE = sh4-linux-
+ endif
  endif
  endif
  
@@@ -205,22 -208,30 +208,30 @@@ LIBS += fs/cramfs/libcramfs.a fs/fat/li
        fs/reiserfs/libreiserfs.a fs/ext2/libext2fs.a
  LIBS += net/libnet.a
  LIBS += disk/libdisk.a
- LIBS += rtc/librtc.a
- LIBS += dtt/libdtt.a
- LIBS += drivers/libdrivers.a
  LIBS += drivers/bios_emulator/libatibiosemu.a
- LIBS += drivers/nand/libnand.a
- LIBS += drivers/nand_legacy/libnand_legacy.a
- LIBS += drivers/onenand/libonenand.a
+ LIBS += drivers/block/libblock.a
+ LIBS += drivers/hwmon/libhwmon.a
+ LIBS += drivers/i2c/libi2c.a
+ LIBS += drivers/input/libinput.a
+ LIBS += drivers/misc/libmisc.a
+ LIBS += drivers/mtd/libmtd.a
+ LIBS += drivers/mtd/nand/libnand.a
+ LIBS += drivers/mtd/nand_legacy/libnand_legacy.a
+ LIBS += drivers/mtd/onenand/libonenand.a
  LIBS += drivers/net/libnet.a
+ LIBS += drivers/net/sk98lin/libsk98lin.a
+ LIBS += drivers/pci/libpci.a
+ LIBS += drivers/pcmcia/libpcmcia.a
  ifeq ($(CPU),mpc83xx)
  LIBS += drivers/qe/qe.a
  endif
  ifeq ($(CPU),mpc85xx)
  LIBS += drivers/qe/qe.a
  endif
+ LIBS += drivers/rtc/librtc.a
  LIBS += drivers/serial/libserial.a
- LIBS += drivers/sk98lin/libsk98lin.a
+ LIBS += drivers/usb/libusb.a
+ LIBS += drivers/video/libvideo.a
  LIBS += post/libpost.a post/drivers/libpostdrivers.a
  LIBS += $(shell if [ -d post/lib_$(ARCH) ]; then echo \
        "post/lib_$(ARCH)/libpost$(ARCH).a"; fi)
@@@ -323,25 -334,65 +334,65 @@@ env
  depend dep:   version
                for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir _depend ; done
  
+ TAG_SUBDIRS += include
+ TAG_SUBDIRS += lib_generic board/$(BOARDDIR)
+ TAG_SUBDIRS += cpu/$(CPU)
+ TAG_SUBDIRS += lib_$(ARCH)
+ TAG_SUBDIRS += fs/cramfs
+ TAG_SUBDIRS += fs/fat
+ TAG_SUBDIRS += fs/fdos
+ TAG_SUBDIRS += fs/jffs2
+ TAG_SUBDIRS += net
+ TAG_SUBDIRS += disk
+ TAG_SUBDIRS += common
+ TAG_SUBDIRS += drivers/bios_emulator
+ TAG_SUBDIRS += drivers/block
+ TAG_SUBDIRS += drivers/hwmon
+ TAG_SUBDIRS += drivers/i2c
+ TAG_SUBDIRS += drivers/input
+ TAG_SUBDIRS += drivers/misc
+ TAG_SUBDIRS += drivers/mtd
+ TAG_SUBDIRS += drivers/mtd/nand
+ TAG_SUBDIRS += drivers/mtd/nand_legacy
+ TAG_SUBDIRS += drivers/mtd/onenand
+ TAG_SUBDIRS += drivers/net
+ TAG_SUBDIRS += drivers/net/sk98lin
+ TAG_SUBDIRS += drivers/pci
+ TAG_SUBDIRS += drivers/pcmcia
+ TAG_SUBDIRS += drivers/qe
+ TAG_SUBDIRS += drivers/rtc
+ TAG_SUBDIRS += drivers/serial
+ TAG_SUBDIRS += drivers/usb
+ TAG_SUBDIRS += drivers/video
+ 
  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 \
-                               net disk rtc dtt drivers drivers/sk98lin common \
-                       \( -name CVS -prune \) -o \( -name '*.[ch]' -print \)`
+               ctags -w -o $(OBJTREE)/ctags `find $(SUBDIRS) $(TAG_SUBDIRS) \
+                                               -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 \
-                               net disk rtc dtt drivers drivers/sk98lin common \
-                       \( -name CVS -prune \) -o \( -name '*.[ch]' -print \)`
+               etags -a -o $(OBJTREE)/etags `find $(SUBDIRS) $(TAG_SUBDIRS) \
+                                               -name '*.[ch]' -print`
  
  $(obj)System.map:     $(obj)u-boot
                @$(NM) $< | \
                grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
                sort > $(obj)System.map
  
+ #
+ # Auto-generate the autoconf.mk file (which is included by all makefiles)
+ #
+ # This target actually generates 2 files; autoconf.mk and autoconf.mk.dep.
+ # the dep file is only include in this top level makefile to determine when
+ # to regenerate the autoconf.mk file.
+ $(OBJTREE)/include/autoconf.mk: $(obj)include/config.h
+       @echo Generating include/autoconf.mk
+       @# Generate the dependancies
+       @$(CC) -M $(HOST_CFLAGS) $(CPPFLAGS) -MQ $@ include/common.h > $@.dep
+       @# Extract the config macros
+       @$(CPP) $(CFLAGS) -dM include/common.h | sed -n -f tools/scripts/define2mk.sed >> $@
+ 
+ sinclude $(OBJTREE)/include/autoconf.mk.dep
+ 
  #########################################################################
  else
  all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \
@@@ -361,7 -412,8 +412,8 @@@ CHANGELOG
  
  unconfig:
        @rm -f $(obj)include/config.h $(obj)include/config.mk \
-               $(obj)board/*/config.tmp $(obj)board/*/*/config.tmp
+               $(obj)board/*/config.tmp $(obj)board/*/*/config.tmp \
+               $(obj)include/autoconf.mk $(obj)include/autoconf.mk.dep
  
  #========================================================================
  # PowerPC
@@@ -1111,9 -1163,6 +1163,6 @@@ CPCI405AB_config:       unconfi
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci405 esd
        @echo "BOARD_REVISION = $(@:_config=)"  >> $(obj)include/config.mk
  
- CPCI440_config:       unconfig
-       @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci440 esd
- 
  CPCIISER4_config:     unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpciiser4 esd
  
@@@ -1168,12 -1217,32 +1217,32 @@@ KAREF_config: unconfi
  katmai_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx katmai amcc
  
+ # Kilauea & Haleakala images are identical (recognized via PVR)
+ kilauea_config \
+ haleakala_config: unconfig
+       @$(MKCONFIG) -n $@ -a kilauea ppc ppc4xx kilauea amcc
+ 
+ kilauea_nand_config \
+ haleakala_nand_config: unconfig
+       @mkdir -p $(obj)include $(obj)board/amcc/kilauea
+       @mkdir -p $(obj)nand_spl/board/amcc/kilauea
+       @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
+       @$(MKCONFIG) -n $@ -a kilauea ppc ppc4xx kilauea amcc
+       @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/kilauea/config.tmp
+       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
+ 
+ korat_config: unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx korat
+ 
  luan_config:  unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx luan amcc
  
  lwmon5_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx lwmon5
  
+ makalu_config:        unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx makalu amcc
+ 
  METROBOX_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx metrobox sandburst
  
@@@ -1217,6 -1286,9 +1286,9 @@@ PLU405_config:  unconfi
  PMC405_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx pmc405 esd
  
+ PMC440_config:        unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx pmc440 esd
+ 
  PPChameleonEVB_config         \
  PPChameleonEVB_BA_25_config   \
  PPChameleonEVB_ME_25_config   \
@@@ -1610,14 -1682,14 +1682,14 @@@ TQM8265_AA_config:  unconfi
        fi; \
        echo "#define CONFIG_$${CFREQ}MHz"      >>$(obj)include/config.h ; \
        echo "... with $${CFREQ}MHz system clock" ; \
-       if [ "$${CACHE}" == "yes" ] ; then \
+       if [ "$${CACHE}" = "yes" ] ; then \
                echo "#define CONFIG_L2_CACHE"  >>$(obj)include/config.h ; \
                echo "... with L2 Cache support" ; \
        else \
                echo "#undef CONFIG_L2_CACHE"   >>$(obj)include/config.h ; \
                echo "... without L2 Cache support" ; \
        fi; \
-       if [ "$${BMODE}" == "60x" ] ; then \
+       if [ "$${BMODE}" = "60x" ] ; then \
                echo "#define CONFIG_BUSMODE_60x" >>$(obj)include/config.h ; \
                echo "... with 60x Bus Mode" ; \
        else \
@@@ -1731,7 -1803,7 +1803,7 @@@ M54455EVB_i66_config :  unconfi
        M54455EVB_i66_config)           FLASH=INTEL; FREQ=66666666;; \
        esac; \
        >include/config.h ; \
-       if [ "$${FLASH}" == "INTEL" ] ; then \
+       if [ "$${FLASH}" = "INTEL" ] ; then \
                echo "#undef CFG_ATMEL_BOOT" >> $(obj)include/config.h ; \
                echo "TEXT_BASE = 0x00000000" > $(obj)board/freescale/m54455evb/config.tmp ; \
                cp $(obj)board/freescale/m54455evb/u-boot.int $(obj)board/freescale/m54455evb/u-boot.lds ; \
@@@ -1862,7 -1934,7 +1934,7 @@@ TQM834x_config: unconfi
  #########################################################################
  
  MPC8540ADS_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8540ads
+       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8540ads freescale
  
  MPC8540EVAL_config \
  MPC8540EVAL_33_config \
@@@ -1886,7 -1958,7 +1958,7 @@@ MPC8540EVAL_66_slave_config:      uncon
        @$(MKCONFIG) -a MPC8540EVAL ppc mpc85xx mpc8540eval
  
  MPC8560ADS_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8560ads
+       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8560ads freescale
  
  MPC8541CDS_legacy_config \
  MPC8541CDS_config:    unconfig
@@@ -1896,7 -1968,7 +1968,7 @@@
                echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
                echo "... legacy" ; \
        fi
-       @$(MKCONFIG) -a MPC8541CDS ppc mpc85xx mpc8541cds cds
+       @$(MKCONFIG) -a MPC8541CDS ppc mpc85xx mpc8541cds freescale
  
  MPC8544DS_config:     unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8544ds freescale
@@@ -1909,7 -1981,7 +1981,7 @@@ MPC8548CDS_config:      unconfi
                echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
                echo "... legacy" ; \
        fi
-       @$(MKCONFIG) -a MPC8548CDS ppc mpc85xx mpc8548cds cds
+       @$(MKCONFIG) -a MPC8548CDS ppc mpc85xx mpc8548cds freescale
  
  MPC8555CDS_legacy_config \
  MPC8555CDS_config:    unconfig
@@@ -1919,10 -1991,10 +1991,10 @@@
                echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
                echo "... legacy" ; \
        fi
-       @$(MKCONFIG) -a MPC8555CDS ppc mpc85xx mpc8555cds cds
+       @$(MKCONFIG) -a MPC8555CDS ppc mpc85xx mpc8555cds freescale
  
  MPC8568MDS_config:    unconfig
-       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8568mds
+       @$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8568mds freescale
  
  PM854_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx pm854
@@@ -1989,6 -2061,9 +2061,9 @@@ TQM8560_config:         unconfi
  ## MPC86xx Systems
  #########################################################################
  
+ MPC8610HPCD_config:   unconfig
+       @$(MKCONFIG) $(@:_config=) ppc mpc86xx mpc8610hpcd freescale
+ 
  MPC8641HPCN_config:    unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc86xx mpc8641hpcn freescale
  
@@@ -2376,12 -2451,9 +2451,12 @@@ zylonite_config 
  #########################################################################
  ## ARM1136 Systems
  #########################################################################
 -omap2420h4_config :    unconfig
 +omap2420h4_config     : unconfig
        @$(MKCONFIG) $(@:_config=) arm arm1136 omap2420h4
  
 +apollon_config                : unconfig
 +      @$(MKCONFIG) $(@:_config=) arm arm1136 apollon
 +
  #========================================================================
  # i386
  #========================================================================
@@@ -2610,7 -2682,30 +2685,30 @@@ bf561-ezkit_config:   unconfi
  #########################################################################
  
  atstk1002_config      :       unconfig
-       @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap7000
+       @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
+ 
+ atstk1003_config      :       unconfig
+       @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
+ 
+ atstk1004_config      :       unconfig
+       @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
+ 
+ #########################################################################
+ #########################################################################
+ #########################################################################
+ 
+ #########################################################################
+ ## sh4 (Renesas SuperH)
+ #########################################################################
+ ms7750se_config: unconfig
+       @ >include/config.h
+       @echo "#define CONFIG_MS7750SE 1" >> include/config.h
+       @./mkconfig -a $(@:_config=) sh sh4 ms7750se
+ 
+ ms7722se_config :       unconfig
+       @ >include/config.h
+       @echo "#define CONFIG_MS7722SE 1" >> include/config.h
+       @./mkconfig -a $(@:_config=) sh sh4 ms7722se
  
  #########################################################################
  #########################################################################